diff --git a/androidll/.gitignore b/androidll/.gitignore deleted file mode 100644 index e10864920..000000000 --- a/androidll/.gitignore +++ /dev/null @@ -1,102 +0,0 @@ -# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore - -# Built application files -*.apk -*.aar -*.ap_ -*.aab - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -# Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# IntelliJ -*.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -# Android Studio 3 in .gitignore file. -.idea/caches -.idea/modules.xml -# Comment next line if keeping position of elements in Navigation Editor is relevant for you -.idea/navEditor.xml - -# Keystore files -# Uncomment the following lines if you do not want to check your keystore files in. -#*.jks -#*.keystore - -# External native build folder generated in Android Studio 2.2 and later -.externalNativeBuild -.cxx/ - -# Google Services (e.g. APIs or Firebase) -# google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -# fastlane -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots -fastlane/test_output -fastlane/readme.md - -# Version control -vcs.xml - -# lint -lint/intermediates/ -lint/generated/ -lint/outputs/ -lint/tmp/ -# lint/reports/ - -# Android Profiling -*.hprof - -# Cordova plugins for Capacitor -capacitor-cordova-android-plugins - -# Copied web assets -app/src/main/assets/public -variables.gradle -settings.gradle -gradlew -gradle/wrapper/gradle-wrapper.properties -gradle.properties -build.gradle \ No newline at end of file diff --git a/androidll/.idea/compiler.xml b/androidll/.idea/compiler.xml deleted file mode 100644 index 61a9130cd..000000000 --- a/androidll/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/androidll/.idea/encodings.xml b/androidll/.idea/encodings.xml deleted file mode 100644 index 5ab53dea3..000000000 --- a/androidll/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/androidll/.idea/jarRepositories.xml b/androidll/.idea/jarRepositories.xml deleted file mode 100644 index 8b0863d54..000000000 --- a/androidll/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/androidll/.idea/misc.xml b/androidll/.idea/misc.xml deleted file mode 100644 index d5d35ec44..000000000 --- a/androidll/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/androidll/app/.gitignore b/androidll/app/.gitignore deleted file mode 100644 index 043df802a..000000000 --- a/androidll/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build/* -!/build/.npmkeep diff --git a/androidll/app/capacitor.build.gradle b/androidll/app/capacitor.build.gradle deleted file mode 100644 index fbb9388e1..000000000 --- a/androidll/app/capacitor.build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN - -android { - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} - -apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" -dependencies { - implementation project(':byteowls-capacitor-filesharer') - implementation project(':capacitor-community-camera-preview') - implementation project(':capacitor-app') - implementation project(':capacitor-browser') - implementation project(':capacitor-camera') - implementation project(':capacitor-device') - implementation project(':capacitor-filesystem') - implementation project(':capacitor-haptics') - implementation project(':capacitor-keyboard') - implementation project(':capacitor-local-notifications') - implementation project(':capacitor-network') - implementation project(':capacitor-push-notifications') - implementation project(':capacitor-share') - implementation project(':capacitor-storage') - implementation project(':sentry-capacitor') - implementation project(':capacitor-voice-recorder') - implementation project(':capacitor2-file-picker') - implementation "com.soundcloud.android:android-crop:1.0.0@aar" - implementation "androidx.appcompat:appcompat:1.0.0" - implementation "com.android.support:support-v4:27.+" - implementation "com.squareup.okhttp:okhttp-urlconnection:2+" -} -apply from: "../../node_modules/com-sarriaroman-photoviewer/src/android/photoviewer.gradle" -apply from: "../../node_modules/cordova-android-support-gradle-release/cordova-android-support-gradle-release.gradle" -apply from: "../../node_modules/cordova-plugin-fingerprint-aio/src/android/build.gradle" - -if (hasProperty('postBuildExtras')) { - postBuildExtras() -} diff --git a/androidll/app/proguard-rules.pro b/androidll/app/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/androidll/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java deleted file mode 100644 index f2c2217ef..000000000 --- a/androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.getcapacitor.myapp; - -import static org.junit.Assert.*; - -import android.content.Context; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.platform.app.InstrumentationRegistry; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.getcapacitor.app", appContext.getPackageName()); - } -} diff --git a/androidll/app/src/main/AndroidManifest.xml b/androidll/app/src/main/AndroidManifest.xml deleted file mode 100644 index 6a2c5b61b..000000000 --- a/androidll/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/androidll/app/src/main/assets/capacitor.config.json b/androidll/app/src/main/assets/capacitor.config.json deleted file mode 100644 index 2399c4927..000000000 --- a/androidll/app/src/main/assets/capacitor.config.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "appId": "com.capacitorjs.app.testapp", - "appName": "capacitor-testapp", - "webDir": "www", - "plugins": { - "SplashScreen": { - "launchAutoHide": false - }, - "LocalNotifications": { - "smallIcon": "ic_stat_icon_config_sample", - "iconColor": "#CE0B7C" - }, - "PushNotifications": { - "presentationOptions": [ - "alert", - "sound" - ] - } - } -} diff --git a/androidll/app/src/main/assets/capacitor.plugins.json b/androidll/app/src/main/assets/capacitor.plugins.json deleted file mode 100644 index 08a376b77..000000000 --- a/androidll/app/src/main/assets/capacitor.plugins.json +++ /dev/null @@ -1,70 +0,0 @@ -[ - { - "pkg": "@byteowls/capacitor-filesharer", - "classpath": "com.byteowls.capacitor.filesharer.FileSharerPlugin" - }, - { - "pkg": "@capacitor-community/camera-preview", - "classpath": "com.ahm.capacitor.camera.preview.CameraPreview" - }, - { - "pkg": "@capacitor/app", - "classpath": "com.capacitorjs.plugins.app.AppPlugin" - }, - { - "pkg": "@capacitor/browser", - "classpath": "com.capacitorjs.plugins.browser.BrowserPlugin" - }, - { - "pkg": "@capacitor/camera", - "classpath": "com.capacitorjs.plugins.camera.CameraPlugin" - }, - { - "pkg": "@capacitor/device", - "classpath": "com.capacitorjs.plugins.device.DevicePlugin" - }, - { - "pkg": "@capacitor/filesystem", - "classpath": "com.capacitorjs.plugins.filesystem.FilesystemPlugin" - }, - { - "pkg": "@capacitor/haptics", - "classpath": "com.capacitorjs.plugins.haptics.HapticsPlugin" - }, - { - "pkg": "@capacitor/keyboard", - "classpath": "com.capacitorjs.plugins.keyboard.KeyboardPlugin" - }, - { - "pkg": "@capacitor/local-notifications", - "classpath": "com.capacitorjs.plugins.localnotifications.LocalNotificationsPlugin" - }, - { - "pkg": "@capacitor/network", - "classpath": "com.capacitorjs.plugins.network.NetworkPlugin" - }, - { - "pkg": "@capacitor/push-notifications", - "classpath": "com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin" - }, - { - "pkg": "@capacitor/share", - "classpath": "com.capacitorjs.plugins.share.SharePlugin" - }, - { - "pkg": "@capacitor/storage", - "classpath": "com.capacitorjs.plugins.storage.StoragePlugin" - }, - { - "pkg": "@sentry/capacitor", - "classpath": "io.sentry.capacitor.SentryCapacitor" - }, - { - "pkg": "capacitor-voice-recorder", - "classpath": "com.tchvu3.capacitorvoicerecorder.VoiceRecorder" - }, - { - "pkg": "capacitor2-file-picker", - "classpath": "com.devmantosh.filepicker.FilePicker" - } -] diff --git a/androidll/app/src/main/res/drawable-land-hdpi/splash.png b/androidll/app/src/main/res/drawable-land-hdpi/splash.png deleted file mode 100644 index e31573b4f..000000000 Binary files a/androidll/app/src/main/res/drawable-land-hdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-land-mdpi/splash.png b/androidll/app/src/main/res/drawable-land-mdpi/splash.png deleted file mode 100644 index f7a64923e..000000000 Binary files a/androidll/app/src/main/res/drawable-land-mdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-land-xhdpi/splash.png b/androidll/app/src/main/res/drawable-land-xhdpi/splash.png deleted file mode 100644 index 807725501..000000000 Binary files a/androidll/app/src/main/res/drawable-land-xhdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-land-xxhdpi/splash.png b/androidll/app/src/main/res/drawable-land-xxhdpi/splash.png deleted file mode 100644 index 14c6c8fe3..000000000 Binary files a/androidll/app/src/main/res/drawable-land-xxhdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png b/androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png deleted file mode 100644 index 244ca2506..000000000 Binary files a/androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-port-hdpi/splash.png b/androidll/app/src/main/res/drawable-port-hdpi/splash.png deleted file mode 100644 index 74faaa583..000000000 Binary files a/androidll/app/src/main/res/drawable-port-hdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-port-mdpi/splash.png b/androidll/app/src/main/res/drawable-port-mdpi/splash.png deleted file mode 100644 index e944f4ad4..000000000 Binary files a/androidll/app/src/main/res/drawable-port-mdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-port-xhdpi/splash.png b/androidll/app/src/main/res/drawable-port-xhdpi/splash.png deleted file mode 100644 index 564a82ff9..000000000 Binary files a/androidll/app/src/main/res/drawable-port-xhdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-port-xxhdpi/splash.png b/androidll/app/src/main/res/drawable-port-xxhdpi/splash.png deleted file mode 100644 index bfabe6871..000000000 Binary files a/androidll/app/src/main/res/drawable-port-xxhdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png b/androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png deleted file mode 100644 index 692907126..000000000 Binary files a/androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21dbd..000000000 --- a/androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/androidll/app/src/main/res/drawable/ic_launcher_background.xml b/androidll/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc538..000000000 --- a/androidll/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/androidll/app/src/main/res/drawable/splash.png b/androidll/app/src/main/res/drawable/splash.png deleted file mode 100644 index f7a64923e..000000000 Binary files a/androidll/app/src/main/res/drawable/splash.png and /dev/null differ diff --git a/androidll/app/src/main/res/layout/activity_main.xml b/androidll/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index b5ad13870..000000000 --- a/androidll/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc5..000000000 --- a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc5..000000000 --- a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index c023e5059..000000000 Binary files a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 2127973b2..000000000 Binary files a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b441f37d6..000000000 Binary files a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 72905b854..000000000 Binary files a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 8ed0605c2..000000000 Binary files a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 9502e47a2..000000000 Binary files a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 4d1e07710..000000000 Binary files a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index df0f15880..000000000 Binary files a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 853db043d..000000000 Binary files a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 6cdf97c11..000000000 Binary files a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 2960cbb61..000000000 Binary files a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e3093a86..000000000 Binary files a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 46de6e255..000000000 Binary files a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index d2ea9abed..000000000 Binary files a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index a40d73e9c..000000000 Binary files a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/androidll/app/src/main/res/values/ic_launcher_background.xml b/androidll/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index c5d5899fd..000000000 --- a/androidll/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFFFFF - \ No newline at end of file diff --git a/androidll/app/src/main/res/values/strings.xml b/androidll/app/src/main/res/values/strings.xml deleted file mode 100644 index 4b39c98c3..000000000 --- a/androidll/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - capacitor-testapp - capacitor-testapp - com.capacitorjs.app.testapp - com.capacitorjs.app.testapp - diff --git a/androidll/app/src/main/res/values/styles.xml b/androidll/app/src/main/res/values/styles.xml deleted file mode 100644 index bb45498f6..000000000 --- a/androidll/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/androidll/app/src/main/res/xml/config.xml b/androidll/app/src/main/res/xml/config.xml deleted file mode 100644 index 48aee8664..000000000 --- a/androidll/app/src/main/res/xml/config.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/androidll/app/src/main/res/xml/file_paths.xml b/androidll/app/src/main/res/xml/file_paths.xml deleted file mode 100644 index bd0c4d80d..000000000 --- a/androidll/app/src/main/res/xml/file_paths.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java deleted file mode 100644 index 029732784..000000000 --- a/androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.getcapacitor.myapp; - -import static org.junit.Assert.*; - -import org.junit.Test; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} diff --git a/androidll/capacitor.settings.gradle b/androidll/capacitor.settings.gradle deleted file mode 100644 index 229ab18e9..000000000 --- a/androidll/capacitor.settings.gradle +++ /dev/null @@ -1,54 +0,0 @@ -// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN -include ':capacitor-android' -project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') - -include ':byteowls-capacitor-filesharer' -project(':byteowls-capacitor-filesharer').projectDir = new File('../node_modules/@byteowls/capacitor-filesharer/android') - -include ':capacitor-community-camera-preview' -project(':capacitor-community-camera-preview').projectDir = new File('../node_modules/@capacitor-community/camera-preview/android') - -include ':capacitor-app' -project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') - -include ':capacitor-browser' -project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android') - -include ':capacitor-camera' -project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android') - -include ':capacitor-device' -project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android') - -include ':capacitor-filesystem' -project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android') - -include ':capacitor-haptics' -project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android') - -include ':capacitor-keyboard' -project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android') - -include ':capacitor-local-notifications' -project(':capacitor-local-notifications').projectDir = new File('../node_modules/@capacitor/local-notifications/android') - -include ':capacitor-network' -project(':capacitor-network').projectDir = new File('../node_modules/@capacitor/network/android') - -include ':capacitor-push-notifications' -project(':capacitor-push-notifications').projectDir = new File('../node_modules/@capacitor/push-notifications/android') - -include ':capacitor-share' -project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android') - -include ':capacitor-storage' -project(':capacitor-storage').projectDir = new File('../node_modules/@capacitor/storage/android') - -include ':sentry-capacitor' -project(':sentry-capacitor').projectDir = new File('../node_modules/@sentry/capacitor/android') - -include ':capacitor-voice-recorder' -project(':capacitor-voice-recorder').projectDir = new File('../node_modules/capacitor-voice-recorder/android') - -include ':capacitor2-file-picker' -project(':capacitor2-file-picker').projectDir = new File('../node_modules/capacitor2-file-picker/android') diff --git a/androidll/gradle/wrapper/gradle-wrapper.jar b/androidll/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c02..000000000 Binary files a/androidll/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/androidll/gradlew.bat b/androidll/gradlew.bat deleted file mode 100644 index 107acd32c..000000000 --- a/androidll/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/package-lock.json b/package-lock.json index dec677ac1..31fc92e69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", "@byteowls/capacitor-filesharer": "^3.0.0", "@capacitor-community/camera-preview": "^1.2.1", - "@capacitor/android": "3.6.0", + "@capacitor/android": "^3.3.2", "@capacitor/app": "^1.0.5", "@capacitor/browser": "1.0.6", "@capacitor/camera": "^1.2.0", @@ -3281,10 +3281,11 @@ } }, "node_modules/@capacitor/android": { - "version": "3.6.0", - "license": "MIT", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.3.2.tgz", + "integrity": "sha512-TG+tGz0KxkT/BgvSLQfbQwQ9c4Budub5TRijIGdmMbB1ZYB76TFhwvVuwWZ52HFSlKS3sx/UYLlbULL7UQ2aug==", "peerDependencies": { - "@capacitor/core": "^3.6.0" + "@capacitor/core": "^3.3.0" } }, "node_modules/@capacitor/app": { @@ -40044,7 +40045,9 @@ } }, "@capacitor/android": { - "version": "3.6.0", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.3.2.tgz", + "integrity": "sha512-TG+tGz0KxkT/BgvSLQfbQwQ9c4Budub5TRijIGdmMbB1ZYB76TFhwvVuwWZ52HFSlKS3sx/UYLlbULL7UQ2aug==", "requires": {} }, "@capacitor/app": { diff --git a/package.json b/package.json index d58502e94..9cede9b70 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", "@byteowls/capacitor-filesharer": "^3.0.0", "@capacitor-community/camera-preview": "^1.2.1", - "@capacitor/android": "3.6.0", + "@capacitor/android": "^3.3.2", "@capacitor/app": "^1.0.5", "@capacitor/browser": "1.0.6", "@capacitor/camera": "^1.2.0", diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 13c40610e..19f88dcc5 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -22,7 +22,7 @@ export class AuthGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - console.log('hire inactinity!', state.url) + console.log('hire auth!', state.url) // if user not active or no session if(!SessionStore.user.Inactivity || !SessionStore.exist) { @@ -31,6 +31,7 @@ export class AuthGuard implements CanActivate { this.router.navigate(['/pin']); } else { this.router.navigate(['/']); + // console.log('goto login page') } return false diff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts index dc3895e34..b51d78918 100644 --- a/src/app/guards/inactivity.guard.ts +++ b/src/app/guards/inactivity.guard.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs'; import { SessionStore } from '../store/session.service'; import { AlertController, Platform } from '@ionic/angular'; import { PermissionService } from '../services/permission.service'; +import { FirstEnterService } from '../services/first-enter.service'; @Injectable({ providedIn: 'root' @@ -14,7 +15,8 @@ export class InactivityGuard implements CanActivate { private router:Router, private platform: Platform, public p: PermissionService, - private alertController: AlertController + private alertController: AlertController, + private FirstEnterService: FirstEnterService ) {} canActivate( @@ -24,30 +26,8 @@ export class InactivityGuard implements CanActivate { console.log('hire inactinity!', state.url) if ( (this.platform.is('desktop') || this.platform.is('mobileweb')) ) { - if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){ - - } - else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){ - this.router.navigate(['/home/chat']); - } - else if(this.p.userPermission(this.p.permissionList.Actions.access)) { - this.router.navigate(['/home/publications']); - } else { - - this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Utilizador sem acesso a aplicação', - buttons: [{ - text: 'Ok', - handler: () => { - - } - }] - }).then( async (alertPopup) => { - await alertPopup.present(); - }) - - } + + this.FirstEnterService.enter() return false } else if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin ) { @@ -68,28 +48,8 @@ export class InactivityGuard implements CanActivate { else { if((SessionStore?.user?.Inactivity)) { - if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){ - this.router.navigate(['/home/events']); - } - else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){ - this.router.navigate(['/home/chat']); - } - else if(this.p.userPermission(this.p.permissionList.Actions.access)){ - this.router.navigate(['/home/publications']); - } else { - this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Utilizador sem acesso a aplicação', - buttons: [{ - text: 'Ok', - handler: () => { - - } - }] - }).then( async (alertPopup)=>{ - await alertPopup.present(); - }) - } + this.FirstEnterService.enter() + return false } diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index f436776da..d4aceeb71 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -2,6 +2,11 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../guards/auth.guard'; import { InactivityGuard } from '../guards/inactivity.guard'; +import { AgendaPageModule } from '../pages/agenda/agenda.module'; +import { ChatPageModule } from '../pages/chat/chat.module'; +import { EventsPageModule } from '../pages/events/events.module'; +import { GabineteDigitalPageModule } from '../pages/gabinete-digital/gabinete-digital.module'; +import { PublicationsPageModule } from '../pages/publications/publications.module'; import { UserDataResolver } from '../resolvers/userData.resolver'; import { HomePage } from './home.page'; @@ -18,7 +23,7 @@ const routes: Routes = [ children: [ { path:'', - loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule) + loadChildren: ()=> EventsPageModule }, { path:':eventId/:caller', @@ -80,7 +85,7 @@ const routes: Routes = [ children: [ { path:'', - loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule) + loadChildren: () => AgendaPageModule }, { path:':eventId/:caller', @@ -128,7 +133,7 @@ const routes: Routes = [ children: [ { path:'', - loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule) + loadChildren: ()=> GabineteDigitalPageModule }, { path:'expediente', @@ -290,7 +295,7 @@ const routes: Routes = [ children: [ { path:'', - loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule) + loadChildren: ()=> PublicationsPageModule }, { path:':folderId', @@ -321,7 +326,7 @@ const routes: Routes = [ children: [ { path:'', - loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule) + loadChildren: ()=> ChatPageModule }, { path:'messages', diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index ec0339a1d..1caeb8499 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -1,5 +1,3 @@ -/* eslint-disable */ -/* tslint:disable */ import { Component, OnInit } from '@angular/core'; import { Event } from '../models/event.model'; import { NotificationsService } from '../services/notifications.service'; @@ -97,7 +95,7 @@ export class HomePage implements OnInit { this.router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) - document.querySelectorAll('.notification').forEach((e: any) => e.remove()) + document.querySelectorAll('.loading-blocker').forEach((e: any) => e.remove()) }); window['platform'] = platform diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 896305f11..9cecd6159 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -9,6 +9,7 @@ export class MessageModel extends models.Model { channels = ArrayField() mentions = ArrayField() msg = models.CharField() + sendAttempt = models.IntegerField() rid = models.CharField() ts = JsonField({blank:true}) u = JsonField() @@ -37,7 +38,7 @@ export class DeleteMessageModel extends models.Model { models.register({ databaseName: 'chat-storage', type: 'indexedDB', - version: 4, + version: 5, models: [MessageModel, DeleteMessageModel] }) diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index fdfdc6f16..71a52a718 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -63,10 +63,11 @@ - + +
Tentar
 {{last ? scrollToBottom() : ''}} @@ -101,10 +102,11 @@ image - + +
Tentar
@@ -158,6 +160,7 @@ +
Tentar
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index 89849c416..7ee672bb2 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -387,3 +387,11 @@ .float-status-all { font-size: 10pt !important; } + +.try { + color: red; + background: #f3414159; + padding: 6px; + border-radius: 10px; + cursor: pointer; +} \ No newline at end of file diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 745e00f99..ea77dd2d7 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -60,10 +60,11 @@ - + +
Tentar
 {{last ? scrollToBottom() : ''}} @@ -96,10 +97,11 @@ image - + +
Tentar
 @@ -161,10 +163,11 @@ - + +
Tentar
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss index 5283f4d58..d4f77f639 100644 --- a/src/app/pages/chat/messages/messages.page.scss +++ b/src/app/pages/chat/messages/messages.page.scss @@ -356,3 +356,11 @@ button::-moz-focus-inner { .float-status-all { font-size: 10pt !important; } + +.try { + color: red; + background: #f3414159; + padding: 6px; + border-radius: 10px; + cursor: pointer; +} \ No newline at end of file diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 82c822b98..113534216 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -280,9 +280,11 @@ export class EventsPage implements OnInit { } }) this.listToPresent = todayEvents - this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate + if(this.listToPresent?.length) { + this.totalEvent = this.listToPresent.length + this.currentEvent = this.listToPresent[0].Subject + this.currentHoursMinutes = this.listToPresent[0].StartDate + } // }) diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 7b0fd417a..f0a349109 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -16,7 +16,7 @@ import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-co import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; import { ChatService } from 'src/app/services/chat.service'; import { Platform } from '@ionic/angular'; - +import { FirstEnterService } from '../../services/first-enter.service'; @Component({ selector: 'app-login', @@ -52,10 +52,13 @@ export class LoginPage implements OnInit { public ChatSystemService: ChatSystemService, private ChatService: ChatService, private platform: Platform, - ) {} + private FirstEnterService: FirstEnterService + ) { + console.log('constructor') + } ngOnInit() { - + console.log('ngOngInit') } togglePassword() { @@ -68,7 +71,6 @@ export class LoginPage implements OnInit { } } - // //Function to validade the login inputs validateUsername() { @@ -134,7 +136,7 @@ export class LoginPage implements OnInit { } this.changeProfileService.runLogin(); - this.getToken(); + // this.getToken(); SessionStore.setInativity(true); this.goback(); @@ -160,7 +162,7 @@ export class LoginPage implements OnInit { this.ChatSystemService.loadChat(); } - this.getToken(); + // this.getToken(); if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) { if(this.sessionStore.hasPin) { @@ -196,22 +198,7 @@ export class LoginPage implements OnInit { if(pathName) { this.router.navigate([pathName]); } else { - if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){ - //When user has got access to Agenda but does not have their own calendar, goes to Agenda - if(this.p.userPermission(this.p.permissionList.Agenda.access) && SessionStore.user.OwnerCalendars.length == 0){ - this.router.navigate(['/home/agenda']); - } - else{ - this.router.navigate(['/home/events']); - } - } - //If user has access permission to both Chat and Action, goes to Chat by default. - else if((this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)) || this.p.userPermission(this.p.permissionList.Chat.access)){ - this.router.navigate(['/home/chat']); - } - else if(this.p.userPermission(this.p.permissionList.Actions.access)){ - this.router.navigate(['/home/publications']); - } + this.FirstEnterService.enter() } } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 522d5fda5..30d87b280 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -59,6 +59,7 @@ export class MessageService { downloadAttachments = false; downloadAttachmentsTemp = 0; UploadAttachmentsTemp = 0; + manualRetry = false constructor( private NfService: NfService, @@ -215,6 +216,9 @@ export class MessageService { } + + functionTimer = null; + async sendRequest(params) { if(params?.attachments) { @@ -228,16 +232,41 @@ export class MessageService { this.RochetChatConnectorService.send(params).then( (ChatMessage: any) => { ChatMessage = ChatMessage.message.result + clearTimeout(this.functionTimer); this.messageSend = true this.redefinedMessage(ChatMessage) + } ).catch((error) => { + clearTimeout(this.functionTimer); console.error(error) }) + + this.functionTimer = setTimeout(() => { + + this.RochetChatConnectorService.registerCallback({ + type:'Onmessage', + key:'ping-pong-message', + funx:(message: any) => { + if(message.msg == "ping") { + if(this.sendAttempt >= 3) { + this.manualRetry = true + } else { + this.send() + } + return true + } + + this.save() + } + }) + + this.RochetChatConnectorService.wsSend({message:{msg:"pong"}, loginRequired: false}) + + }, 8000) } else { - // console.log("reconnect") this.RochetChatConnectorService.registerCallback({ type: 'reConnect', funx: async ()=> { @@ -335,6 +364,7 @@ export class MessageService { channels: this.channels, mentions: this.mentions, //msg: this.AESEncrypt.encrypt(this.msg, SessionStore.user.UserName), + sendAttempt: this.sendAttempt, msg:this.msg, rid: this.rid, ts: this.ts, diff --git a/src/app/services/chat/rochet-chat-connector.service.ts b/src/app/services/chat/rochet-chat-connector.service.ts index c28afb167..0893f0f51 100644 --- a/src/app/services/chat/rochet-chat-connector.service.ts +++ b/src/app/services/chat/rochet-chat-connector.service.ts @@ -46,6 +46,10 @@ export class RochetChatConnectorService { } + wsSend({message, requestId = uuidv4(), loginRequired = true}:send) { + this.ws.send({message:{msg:"pong"}, loginRequired: false}) + } + login() { // dont login if is already login if(this.isLogin == true) { @@ -739,7 +743,7 @@ export class RochetChatConnectorService { } else { let messageStr = JSON.stringify(message) // - // console.log(messageStr) + console.log(messageStr) this.socket.send(messageStr) } return requestId @@ -747,6 +751,8 @@ export class RochetChatConnectorService { onmessage: async (event: any)=> { const data = JSON.parse(event.data) + + console.log('data', data) for (const [key, value] of Object.entries(this.wsCallbacks)) { if(value.type== 'Onmessage') { diff --git a/src/app/services/first-enter.service.spec.ts b/src/app/services/first-enter.service.spec.ts new file mode 100644 index 000000000..f4144dcb1 --- /dev/null +++ b/src/app/services/first-enter.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { FirstEnterService } from './first-enter.service'; + +describe('FirstEnterService', () => { + let service: FirstEnterService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(FirstEnterService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/first-enter.service.ts b/src/app/services/first-enter.service.ts new file mode 100644 index 000000000..8560d8bf4 --- /dev/null +++ b/src/app/services/first-enter.service.ts @@ -0,0 +1,51 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; + +import { AlertController, Platform } from '@ionic/angular'; +import { PermissionService } from '../services/permission.service'; +import { SessionStore } from '../store/session.service'; + +@Injectable({ + providedIn: 'root' +}) +export class FirstEnterService { + + constructor(private router:Router, + private platform: Platform, + public p: PermissionService, + private alertController: AlertController) { } + + + enter( ) { + if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){ + //When user has got access to Agenda but does not have their own calendar, goes to Agenda + if(this.p.userPermission(this.p.permissionList.Agenda.access) && SessionStore.user.OwnerCalendars.length == 0){ + this.router.navigate(['/home/agenda']); + } + else{ + this.router.navigate(['/home/events']); + } + } + else if((this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)) || this.p.userPermission(this.p.permissionList.Chat.access)){ + this.router.navigate(['/home/chat']); + } + else if(this.p.userPermission(this.p.permissionList.Actions.access)) { + this.router.navigate(['/home/publications']); + } else { + + this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Utilizador sem acesso a aplicação', + buttons: [{ + text: 'Ok', + handler: () => { + + } + }] + }).then( async (alertPopup) => { + await alertPopup.present(); + }) + + } + } +} diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 93f1f1580..25ac6a487 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -59,10 +59,11 @@ - + +
Tentar
 {{last ? scrollToBottom() : ''}} @@ -104,10 +105,11 @@ image - + +
Tentar
 @@ -158,10 +160,11 @@ - + +
Tentar
 diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 8df9dee88..c847864ad 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -321,3 +321,12 @@ .float-status-all { font-size: 10pt !important; } + + +.try { + color: red; + background: #f3414159; + padding: 6px; + border-radius: 10px; + cursor: pointer; +} \ No newline at end of file diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index f4236f3bd..3392a0e4e 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -60,10 +60,11 @@ - + +
Tentar
 {{last ? scrollToBottom() : ''}} @@ -103,10 +104,11 @@ image - + +
Tentar
@@ -168,10 +170,11 @@ - + +
Tentar
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 2d4bb8fb7..9349b4c69 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -388,4 +388,13 @@ ion-footer { .audioButtonPlay { margin-bottom: 100%; right: 50%; +} + + +.try { + color: red; + background: #f3414159; + padding: 6px; + border-radius: 10px; + cursor: pointer; } \ No newline at end of file diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 9a9e9487f..ade54d692 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -32,7 +32,6 @@ import { File } from '@awesome-cordova-plugins/file/ngx'; import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; import { SessionStore } from 'src/app/store/session.service'; import { Howl } from 'howler'; -import { runInThisContext } from 'vm'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page'; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 50f15c66e..ba56d63fc 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,12 +1,15 @@ import { versionData } from '../../version/git-version' export const environment = { // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - apiURL: 'https://gd-api.oapr.gov.ao/api/', + //apiURL: 'https://gd-api.oapr.gov.ao/api/', + apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', // apiChatUrl: 'http://192.168.0.29:3000/api/v1/', // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', - apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', - apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', + apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', + //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', /* apiChatUrl: 'https://www.tabularium.pt/api/v1/', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 57721f3a5..f643c390c 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,9 +14,9 @@ export const environment = { apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */ // apiChatUrl: 'https://www.tabularium.pt/api/v1/', production: true, - domain: 'gabinetedigital.local', + domain: 'paulo.pinto@gabinetedigital.local', defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local - defaultuserpwd: 'M@p2022', //tabteste@006, + defaultuserpwd: 'tabteste@006', //tabteste@006, chatOffline: true, presidencia: false, version: versionData, diff --git a/version/git-version.js b/version/git-version.js index be29c55b1..0da9d8911 100644 --- a/version/git-version.js +++ b/version/git-version.js @@ -30,4 +30,4 @@ const versionInfo = { const versionInfoJson = JSON.stringify(versionInfo, null, 2); //console.log("versionInfo", versionInfo.diff) writeFileSync('./version/git-version.ts', "export let versionData = "+versionInfoJson); -writeFileSync('./version/git-version.json', versionInfoJson); \ No newline at end of file +// writeFileSync('./version/git-version.json', versionInfoJson); \ No newline at end of file diff --git a/version/git-version.json b/version/git-version.json deleted file mode 100644 index bc3de8662..000000000 --- a/version/git-version.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "shortSHA": "d8ac3d3b3", - "SHA": "d8ac3d3b3d35cde1a6ea62ac17a02a15a0b66187", - "branch": "develop_bitOut-fix", - "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Dec 22 17:59:49 2022 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4569", - "change": "diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json\nindex efe947a63..08a376b77 100644\n--- a/android/app/src/main/assets/capacitor.plugins.json\n+++ b/android/app/src/main/assets/capacitor.plugins.json\n@@ -9,51 +9,51 @@\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/app\",\n-\t\t\"classpath\": \"com.gpr.plugins.app.AppPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.app.AppPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/browser\",\n-\t\t\"classpath\": \"com.gpr.plugins.browser.BrowserPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.browser.BrowserPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/camera\",\n-\t\t\"classpath\": \"com.gpr.plugins.camera.CameraPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.camera.CameraPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/device\",\n-\t\t\"classpath\": \"com.gpr.plugins.device.DevicePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.device.DevicePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/filesystem\",\n-\t\t\"classpath\": \"com.gpr.plugins.filesystem.FilesystemPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.filesystem.FilesystemPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/haptics\",\n-\t\t\"classpath\": \"com.gpr.plugins.haptics.HapticsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.haptics.HapticsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/keyboard\",\n-\t\t\"classpath\": \"com.gpr.plugins.keyboard.KeyboardPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.keyboard.KeyboardPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/local-notifications\",\n-\t\t\"classpath\": \"com.gpr.plugins.localnotifications.LocalNotificationsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.localnotifications.LocalNotificationsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/network\",\n-\t\t\"classpath\": \"com.gpr.plugins.network.NetworkPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.network.NetworkPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/push-notifications\",\n-\t\t\"classpath\": \"com.gpr.plugins.pushnotifications.PushNotificationsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/share\",\n-\t\t\"classpath\": \"com.gpr.plugins.share.SharePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.share.SharePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/storage\",\n-\t\t\"classpath\": \"com.gpr.plugins.storage.StoragePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.storage.StoragePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@sentry/capacitor\",\ndiff --git a/android/build.gradle b/android/build.gradle\nindex ad085c345..8b15a0939 100644\n--- a/android/build.gradle\n+++ b/android/build.gradle\n@@ -1,13 +1,13 @@\n // Top-level build file where you can add configuration options common to all sub-projects/modules.\n \n buildscript {\n- \n+\n repositories {\n google()\n jcenter()\n }\n dependencies {\n- classpath 'com.android.tools.build:gradle:4.2.1'\n+ classpath 'com.android.tools.build:gradle:7.0.4'\n classpath 'com.google.gms:google-services:4.3.5'\n \n // NOTE: Do not place your application dependencies here; they belong\ndiff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties\nindex 3c4101c3e..29e413457 100644\n--- a/android/gradle/wrapper/gradle-wrapper.properties\n+++ b/android/gradle/wrapper/gradle-wrapper.properties\n@@ -1,5 +1,5 @@\n distributionBase=GRADLE_USER_HOME\n distributionPath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0-all.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0.2-all.zip\n zipStoreBase=GRADLE_USER_HOME\n zipStorePath=wrapper/dists\ndiff --git a/package.json b/package.json\nindex 90f3fb61a..e8e4b4e8d 100644\n--- a/package.json\n+++ b/package.json\n@@ -13,7 +13,8 @@\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n- \"build:version\":\"node ./version/git-version.js\"\n+ \"build:version\": \"node ./version/git-version.js\",\n+ \"ionic-build\": \"ionic cap run android --prod\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/readme.md b/readme.md\nindex 2b68cd43d..4ac2e2924 100644\n--- a/readme.md\n+++ b/readme.md\n@@ -17,15 +17,11 @@ npm install -g @angular/cli\n npm install -g cordova\n npm install -g cordova-res\n \n-## Mobile first dependencies\n-ionic cordova plugin add cordova-plugin-network-information\n-\n ## memory leak\n set NODE_OPTIONS=--max_old_space_size=99999996\n-\n-npm i cordova-plugin-androidx-adapter\n-npm install jetifier\n-npx jetify\n+npm i cordova-plugin-androidx-adapter --force\n+npm install jetifier --force\n+npx jetify --force\n \n ```\n \n@@ -55,7 +51,7 @@ ionic serve build --prod\n npm run start\n ```\n \n-## Run test[.](#run-test)\n+## Run test\n \n ```bash\n # incase you don't have .env file\n@@ -75,6 +71,14 @@ cp -r ./www ./serve\n npm run dev:share\n ```\n \n+\n+\n+## Tag stable version\n+\n+```bash\n+git tag stable\n+```\n+\n ## Contributing\n \n For major changes, please open an issue first to discuss what you would like to change.\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 9df0e95ab..50f15c66e 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -7,6 +7,8 @@ export const environment = {\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex 7daab784b..57721f3a5 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -6,8 +6,10 @@ export const environment = {\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/txt.txt b/txt.txt\ndeleted file mode 100644\nindex f7c460ef9..000000000\n--- a/txt.txt\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-assets/images/theme/gov/icons-search-close.svg\n-assets/images/icons-most-searched-words-open.svg\n\\ No newline at end of file\ndiff --git a/version/git-version.js b/version/git-version.js\nindex 5591e502e..be29c55b1 100644\n--- a/version/git-version.js\n+++ b/version/git-version.js\n@@ -11,6 +11,8 @@ const commitTime = childProcess.execSync(\"git log -1 --pretty=format:'%cd'\").toS\n const commitMsg = childProcess.execSync(\"git log -1 --pretty=%B\").toString().trim();\n const totalCommitCount = childProcess.execSync(\"git rev-list --count HEAD\").toString().trim();\n const change = childProcess.execSync(`git diff -- \":!/version/git-version.ts\" \":!/version/git-version.json\" `,{cwd: rootDir }).toString().trim();\n+const changeStatus = childProcess.execSync(\"git status\").toString().trim();\n+const changeAuthor = childProcess.execSync(\"whoami\").toString().trim();\n \n const versionInfo = {\n shortSHA: shortSHA,\n@@ -20,7 +22,9 @@ const versionInfo = {\n lastCommitTime: commitTime,\n lastCommitMessage: commitMsg,\n lastCommitNumber: totalCommitCount,\n- change\n+ change,\n+ changeStatus,\n+ changeAuthor,\n }\n \n const versionInfoJson = JSON.stringify(versionInfo, null, 2);", - "changeStatus": "On branch develop_bitOut-fix\nChanges not staged for commit:\n (use \"git add/rm ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: android/app/src/main/assets/capacitor.plugins.json\n\tmodified: android/build.gradle\n\tmodified: android/gradle/wrapper/gradle-wrapper.properties\n\tmodified: package.json\n\tmodified: readme.md\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tdeleted: txt.txt\n\tmodified: version/git-version.js\n\tmodified: version/git-version.json\n\tmodified: version/git-version.ts\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")", - "changeAuthor": "peter.maquiran" -} \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index c3bb386fa..c8477ce87 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d8ac3d3b3", - "SHA": "d8ac3d3b3d35cde1a6ea62ac17a02a15a0b66187", + "shortSHA": "b83fff6fb", + "SHA": "b83fff6fbd41a172ab899d699effeb3a3f141fa7", "branch": "develop_bitOut-fix", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Dec 22 17:59:49 2022 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4569", - "change": "diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json\nindex efe947a63..08a376b77 100644\n--- a/android/app/src/main/assets/capacitor.plugins.json\n+++ b/android/app/src/main/assets/capacitor.plugins.json\n@@ -9,51 +9,51 @@\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/app\",\n-\t\t\"classpath\": \"com.gpr.plugins.app.AppPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.app.AppPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/browser\",\n-\t\t\"classpath\": \"com.gpr.plugins.browser.BrowserPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.browser.BrowserPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/camera\",\n-\t\t\"classpath\": \"com.gpr.plugins.camera.CameraPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.camera.CameraPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/device\",\n-\t\t\"classpath\": \"com.gpr.plugins.device.DevicePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.device.DevicePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/filesystem\",\n-\t\t\"classpath\": \"com.gpr.plugins.filesystem.FilesystemPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.filesystem.FilesystemPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/haptics\",\n-\t\t\"classpath\": \"com.gpr.plugins.haptics.HapticsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.haptics.HapticsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/keyboard\",\n-\t\t\"classpath\": \"com.gpr.plugins.keyboard.KeyboardPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.keyboard.KeyboardPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/local-notifications\",\n-\t\t\"classpath\": \"com.gpr.plugins.localnotifications.LocalNotificationsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.localnotifications.LocalNotificationsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/network\",\n-\t\t\"classpath\": \"com.gpr.plugins.network.NetworkPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.network.NetworkPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/push-notifications\",\n-\t\t\"classpath\": \"com.gpr.plugins.pushnotifications.PushNotificationsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/share\",\n-\t\t\"classpath\": \"com.gpr.plugins.share.SharePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.share.SharePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/storage\",\n-\t\t\"classpath\": \"com.gpr.plugins.storage.StoragePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.storage.StoragePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@sentry/capacitor\",\ndiff --git a/android/build.gradle b/android/build.gradle\nindex ad085c345..8b15a0939 100644\n--- a/android/build.gradle\n+++ b/android/build.gradle\n@@ -1,13 +1,13 @@\n // Top-level build file where you can add configuration options common to all sub-projects/modules.\n \n buildscript {\n- \n+\n repositories {\n google()\n jcenter()\n }\n dependencies {\n- classpath 'com.android.tools.build:gradle:4.2.1'\n+ classpath 'com.android.tools.build:gradle:7.0.4'\n classpath 'com.google.gms:google-services:4.3.5'\n \n // NOTE: Do not place your application dependencies here; they belong\ndiff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties\nindex 3c4101c3e..29e413457 100644\n--- a/android/gradle/wrapper/gradle-wrapper.properties\n+++ b/android/gradle/wrapper/gradle-wrapper.properties\n@@ -1,5 +1,5 @@\n distributionBase=GRADLE_USER_HOME\n distributionPath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0-all.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0.2-all.zip\n zipStoreBase=GRADLE_USER_HOME\n zipStorePath=wrapper/dists\ndiff --git a/package.json b/package.json\nindex 90f3fb61a..e8e4b4e8d 100644\n--- a/package.json\n+++ b/package.json\n@@ -13,7 +13,8 @@\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n- \"build:version\":\"node ./version/git-version.js\"\n+ \"build:version\": \"node ./version/git-version.js\",\n+ \"ionic-build\": \"ionic cap run android --prod\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/readme.md b/readme.md\nindex 2b68cd43d..4ac2e2924 100644\n--- a/readme.md\n+++ b/readme.md\n@@ -17,15 +17,11 @@ npm install -g @angular/cli\n npm install -g cordova\n npm install -g cordova-res\n \n-## Mobile first dependencies\n-ionic cordova plugin add cordova-plugin-network-information\n-\n ## memory leak\n set NODE_OPTIONS=--max_old_space_size=99999996\n-\n-npm i cordova-plugin-androidx-adapter\n-npm install jetifier\n-npx jetify\n+npm i cordova-plugin-androidx-adapter --force\n+npm install jetifier --force\n+npx jetify --force\n \n ```\n \n@@ -55,7 +51,7 @@ ionic serve build --prod\n npm run start\n ```\n \n-## Run test[.](#run-test)\n+## Run test\n \n ```bash\n # incase you don't have .env file\n@@ -75,6 +71,14 @@ cp -r ./www ./serve\n npm run dev:share\n ```\n \n+\n+\n+## Tag stable version\n+\n+```bash\n+git tag stable\n+```\n+\n ## Contributing\n \n For major changes, please open an issue first to discuss what you would like to change.\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 9df0e95ab..50f15c66e 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -7,6 +7,8 @@ export const environment = {\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex 7daab784b..57721f3a5 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -6,8 +6,10 @@ export const environment = {\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/txt.txt b/txt.txt\ndeleted file mode 100644\nindex f7c460ef9..000000000\n--- a/txt.txt\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-assets/images/theme/gov/icons-search-close.svg\n-assets/images/icons-most-searched-words-open.svg\n\\ No newline at end of file\ndiff --git a/version/git-version.js b/version/git-version.js\nindex 5591e502e..be29c55b1 100644\n--- a/version/git-version.js\n+++ b/version/git-version.js\n@@ -11,6 +11,8 @@ const commitTime = childProcess.execSync(\"git log -1 --pretty=format:'%cd'\").toS\n const commitMsg = childProcess.execSync(\"git log -1 --pretty=%B\").toString().trim();\n const totalCommitCount = childProcess.execSync(\"git rev-list --count HEAD\").toString().trim();\n const change = childProcess.execSync(`git diff -- \":!/version/git-version.ts\" \":!/version/git-version.json\" `,{cwd: rootDir }).toString().trim();\n+const changeStatus = childProcess.execSync(\"git status\").toString().trim();\n+const changeAuthor = childProcess.execSync(\"whoami\").toString().trim();\n \n const versionInfo = {\n shortSHA: shortSHA,\n@@ -20,7 +22,9 @@ const versionInfo = {\n lastCommitTime: commitTime,\n lastCommitMessage: commitMsg,\n lastCommitNumber: totalCommitCount,\n- change\n+ change,\n+ changeStatus,\n+ changeAuthor,\n }\n \n const versionInfoJson = JSON.stringify(versionInfo, null, 2);", - "changeStatus": "On branch develop_bitOut-fix\nChanges not staged for commit:\n (use \"git add/rm ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: android/app/src/main/assets/capacitor.plugins.json\n\tmodified: android/build.gradle\n\tmodified: android/gradle/wrapper/gradle-wrapper.properties\n\tmodified: package.json\n\tmodified: readme.md\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tdeleted: txt.txt\n\tmodified: version/git-version.js\n\tmodified: version/git-version.json\n\tmodified: version/git-version.ts\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")", + "lastCommitTime": "'Fri Dec 23 12:23:16 2022 +0100'", + "lastCommitMessage": "remove sentry", + "lastCommitNumber": "4570", + "change": "diff --git a/androidll/.gitignore b/androidll/.gitignore\ndeleted file mode 100644\nindex e10864920..000000000\n--- a/androidll/.gitignore\n+++ /dev/null\n@@ -1,102 +0,0 @@\n-# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore\n-\n-# Built application files\n-*.apk\n-*.aar\n-*.ap_\n-*.aab\n-\n-# Files for the ART/Dalvik VM\n-*.dex\n-\n-# Java class files\n-*.class\n-\n-# Generated files\n-bin/\n-gen/\n-out/\n-# Uncomment the following line in case you need and you don't have the release build type files in your app\n-# release/\n-\n-# Gradle files\n-.gradle/\n-build/\n-\n-# Local configuration file (sdk path, etc)\n-local.properties\n-\n-# Proguard folder generated by Eclipse\n-proguard/\n-\n-# Log Files\n-*.log\n-\n-# Android Studio Navigation editor temp files\n-.navigation/\n-\n-# Android Studio captures folder\n-captures/\n-\n-# IntelliJ\n-*.iml\n-.idea/workspace.xml\n-.idea/tasks.xml\n-.idea/gradle.xml\n-.idea/assetWizardSettings.xml\n-.idea/dictionaries\n-.idea/libraries\n-# Android Studio 3 in .gitignore file.\n-.idea/caches\n-.idea/modules.xml\n-# Comment next line if keeping position of elements in Navigation Editor is relevant for you\n-.idea/navEditor.xml\n-\n-# Keystore files\n-# Uncomment the following lines if you do not want to check your keystore files in.\n-#*.jks\n-#*.keystore\n-\n-# External native build folder generated in Android Studio 2.2 and later\n-.externalNativeBuild\n-.cxx/\n-\n-# Google Services (e.g. APIs or Firebase)\n-# google-services.json\n-\n-# Freeline\n-freeline.py\n-freeline/\n-freeline_project_description.json\n-\n-# fastlane\n-fastlane/report.xml\n-fastlane/Preview.html\n-fastlane/screenshots\n-fastlane/test_output\n-fastlane/readme.md\n-\n-# Version control\n-vcs.xml\n-\n-# lint\n-lint/intermediates/\n-lint/generated/\n-lint/outputs/\n-lint/tmp/\n-# lint/reports/\n-\n-# Android Profiling\n-*.hprof\n-\n-# Cordova plugins for Capacitor\n-capacitor-cordova-android-plugins\n-\n-# Copied web assets\n-app/src/main/assets/public\n-variables.gradle\n-settings.gradle\n-gradlew\n-gradle/wrapper/gradle-wrapper.properties\n-gradle.properties\n-build.gradle\n\\ No newline at end of file\ndiff --git a/androidll/.idea/compiler.xml b/androidll/.idea/compiler.xml\ndeleted file mode 100644\nindex 61a9130cd..000000000\n--- a/androidll/.idea/compiler.xml\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-\n-\n- \n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/.idea/encodings.xml b/androidll/.idea/encodings.xml\ndeleted file mode 100644\nindex 5ab53dea3..000000000\n--- a/androidll/.idea/encodings.xml\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-\n-\n- \n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/.idea/jarRepositories.xml b/androidll/.idea/jarRepositories.xml\ndeleted file mode 100644\nindex 8b0863d54..000000000\n--- a/androidll/.idea/jarRepositories.xml\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-\n-\n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/.idea/misc.xml b/androidll/.idea/misc.xml\ndeleted file mode 100644\nindex d5d35ec44..000000000\n--- a/androidll/.idea/misc.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n-\n- \n- \n- \n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/app/.gitignore b/androidll/app/.gitignore\ndeleted file mode 100644\nindex 043df802a..000000000\n--- a/androidll/app/.gitignore\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-/build/*\n-!/build/.npmkeep\ndiff --git a/androidll/app/capacitor.build.gradle b/androidll/app/capacitor.build.gradle\ndeleted file mode 100644\nindex fbb9388e1..000000000\n--- a/androidll/app/capacitor.build.gradle\n+++ /dev/null\n@@ -1,40 +0,0 @@\n-// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME \"capacitor update\" IS RUN\n-\n-android {\n- compileOptions {\n- sourceCompatibility JavaVersion.VERSION_1_8\n- targetCompatibility JavaVersion.VERSION_1_8\n- }\n-}\n-\n-apply from: \"../capacitor-cordova-android-plugins/cordova.variables.gradle\"\n-dependencies {\n- implementation project(':byteowls-capacitor-filesharer')\n- implementation project(':capacitor-community-camera-preview')\n- implementation project(':capacitor-app')\n- implementation project(':capacitor-browser')\n- implementation project(':capacitor-camera')\n- implementation project(':capacitor-device')\n- implementation project(':capacitor-filesystem')\n- implementation project(':capacitor-haptics')\n- implementation project(':capacitor-keyboard')\n- implementation project(':capacitor-local-notifications')\n- implementation project(':capacitor-network')\n- implementation project(':capacitor-push-notifications')\n- implementation project(':capacitor-share')\n- implementation project(':capacitor-storage')\n- implementation project(':sentry-capacitor')\n- implementation project(':capacitor-voice-recorder')\n- implementation project(':capacitor2-file-picker')\n- implementation \"com.soundcloud.android:android-crop:1.0.0@aar\"\n- implementation \"androidx.appcompat:appcompat:1.0.0\"\n- implementation \"com.android.support:support-v4:27.+\"\n- implementation \"com.squareup.okhttp:okhttp-urlconnection:2+\"\n-}\n-apply from: \"../../node_modules/com-sarriaroman-photoviewer/src/android/photoviewer.gradle\"\n-apply from: \"../../node_modules/cordova-android-support-gradle-release/cordova-android-support-gradle-release.gradle\"\n-apply from: \"../../node_modules/cordova-plugin-fingerprint-aio/src/android/build.gradle\"\n-\n-if (hasProperty('postBuildExtras')) {\n- postBuildExtras()\n-}\ndiff --git a/androidll/app/proguard-rules.pro b/androidll/app/proguard-rules.pro\ndeleted file mode 100644\nindex f1b424510..000000000\n--- a/androidll/app/proguard-rules.pro\n+++ /dev/null\n@@ -1,21 +0,0 @@\n-# Add project specific ProGuard rules here.\n-# You can control the set of applied configuration files using the\n-# proguardFiles setting in build.gradle.\n-#\n-# For more details, see\n-# http://developer.android.com/guide/developing/tools/proguard.html\n-\n-# If your project uses WebView with JS, uncomment the following\n-# and specify the fully qualified class name to the JavaScript interface\n-# class:\n-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {\n-# public *;\n-#}\n-\n-# Uncomment this to preserve the line number information for\n-# debugging stack traces.\n-#-keepattributes SourceFile,LineNumberTable\n-\n-# If you keep the line number information, uncomment this to\n-# hide the original source file name.\n-#-renamesourcefileattribute SourceFile\ndiff --git a/androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java\ndeleted file mode 100644\nindex f2c2217ef..000000000\n--- a/androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java\n+++ /dev/null\n@@ -1,26 +0,0 @@\n-package com.getcapacitor.myapp;\n-\n-import static org.junit.Assert.*;\n-\n-import android.content.Context;\n-import androidx.test.ext.junit.runners.AndroidJUnit4;\n-import androidx.test.platform.app.InstrumentationRegistry;\n-import org.junit.Test;\n-import org.junit.runner.RunWith;\n-\n-/**\n- * Instrumented test, which will execute on an Android device.\n- *\n- * @see Testing documentation\n- */\n-@RunWith(AndroidJUnit4.class)\n-public class ExampleInstrumentedTest {\n-\n- @Test\n- public void useAppContext() throws Exception {\n- // Context of the app under test.\n- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();\n-\n- assertEquals(\"com.getcapacitor.app\", appContext.getPackageName());\n- }\n-}\ndiff --git a/androidll/app/src/main/AndroidManifest.xml b/androidll/app/src/main/AndroidManifest.xml\ndeleted file mode 100644\nindex 6a2c5b61b..000000000\n--- a/androidll/app/src/main/AndroidManifest.xml\n+++ /dev/null\n@@ -1,41 +0,0 @@\n-\n-\n-\n- \n-\n- \n-\n- \n- \n- \n- \n-\n- \n-\n- \n- \n- \n- \n-\n- \n-\n- \n-\ndiff --git a/androidll/app/src/main/assets/capacitor.config.json b/androidll/app/src/main/assets/capacitor.config.json\ndeleted file mode 100644\nindex 2399c4927..000000000\n--- a/androidll/app/src/main/assets/capacitor.config.json\n+++ /dev/null\n@@ -1,20 +0,0 @@\n-{\n-\t\"appId\": \"com.capacitorjs.app.testapp\",\n-\t\"appName\": \"capacitor-testapp\",\n-\t\"webDir\": \"www\",\n-\t\"plugins\": {\n-\t\t\"SplashScreen\": {\n-\t\t\t\"launchAutoHide\": false\n-\t\t},\n-\t\t\"LocalNotifications\": {\n-\t\t\t\"smallIcon\": \"ic_stat_icon_config_sample\",\n-\t\t\t\"iconColor\": \"#CE0B7C\"\n-\t\t},\n-\t\t\"PushNotifications\": {\n-\t\t\t\"presentationOptions\": [\n-\t\t\t\t\"alert\",\n-\t\t\t\t\"sound\"\n-\t\t\t]\n-\t\t}\n-\t}\n-}\ndiff --git a/androidll/app/src/main/assets/capacitor.plugins.json b/androidll/app/src/main/assets/capacitor.plugins.json\ndeleted file mode 100644\nindex 08a376b77..000000000\n--- a/androidll/app/src/main/assets/capacitor.plugins.json\n+++ /dev/null\n@@ -1,70 +0,0 @@\n-[\n-\t{\n-\t\t\"pkg\": \"@byteowls/capacitor-filesharer\",\n-\t\t\"classpath\": \"com.byteowls.capacitor.filesharer.FileSharerPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor-community/camera-preview\",\n-\t\t\"classpath\": \"com.ahm.capacitor.camera.preview.CameraPreview\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/app\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.app.AppPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/browser\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.browser.BrowserPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/camera\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.camera.CameraPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/device\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.device.DevicePlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/filesystem\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.filesystem.FilesystemPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/haptics\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.haptics.HapticsPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/keyboard\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.keyboard.KeyboardPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/local-notifications\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.localnotifications.LocalNotificationsPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/network\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.network.NetworkPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/push-notifications\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/share\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.share.SharePlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@capacitor/storage\",\n-\t\t\"classpath\": \"com.capacitorjs.plugins.storage.StoragePlugin\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"@sentry/capacitor\",\n-\t\t\"classpath\": \"io.sentry.capacitor.SentryCapacitor\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"capacitor-voice-recorder\",\n-\t\t\"classpath\": \"com.tchvu3.capacitorvoicerecorder.VoiceRecorder\"\n-\t},\n-\t{\n-\t\t\"pkg\": \"capacitor2-file-picker\",\n-\t\t\"classpath\": \"com.devmantosh.filepicker.FilePicker\"\n-\t}\n-]\ndiff --git a/androidll/app/src/main/res/drawable-land-hdpi/splash.png b/androidll/app/src/main/res/drawable-land-hdpi/splash.png\ndeleted file mode 100644\nindex e31573b4f..000000000\nBinary files a/androidll/app/src/main/res/drawable-land-hdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-land-mdpi/splash.png b/androidll/app/src/main/res/drawable-land-mdpi/splash.png\ndeleted file mode 100644\nindex f7a64923e..000000000\nBinary files a/androidll/app/src/main/res/drawable-land-mdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-land-xhdpi/splash.png b/androidll/app/src/main/res/drawable-land-xhdpi/splash.png\ndeleted file mode 100644\nindex 807725501..000000000\nBinary files a/androidll/app/src/main/res/drawable-land-xhdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-land-xxhdpi/splash.png b/androidll/app/src/main/res/drawable-land-xxhdpi/splash.png\ndeleted file mode 100644\nindex 14c6c8fe3..000000000\nBinary files a/androidll/app/src/main/res/drawable-land-xxhdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png b/androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png\ndeleted file mode 100644\nindex 244ca2506..000000000\nBinary files a/androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-port-hdpi/splash.png b/androidll/app/src/main/res/drawable-port-hdpi/splash.png\ndeleted file mode 100644\nindex 74faaa583..000000000\nBinary files a/androidll/app/src/main/res/drawable-port-hdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-port-mdpi/splash.png b/androidll/app/src/main/res/drawable-port-mdpi/splash.png\ndeleted file mode 100644\nindex e944f4ad4..000000000\nBinary files a/androidll/app/src/main/res/drawable-port-mdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-port-xhdpi/splash.png b/androidll/app/src/main/res/drawable-port-xhdpi/splash.png\ndeleted file mode 100644\nindex 564a82ff9..000000000\nBinary files a/androidll/app/src/main/res/drawable-port-xhdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-port-xxhdpi/splash.png b/androidll/app/src/main/res/drawable-port-xxhdpi/splash.png\ndeleted file mode 100644\nindex bfabe6871..000000000\nBinary files a/androidll/app/src/main/res/drawable-port-xxhdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png b/androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png\ndeleted file mode 100644\nindex 692907126..000000000\nBinary files a/androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml\ndeleted file mode 100644\nindex c7bd21dbd..000000000\n--- a/androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-\n- \n- \n- \n- \n- \n- \n- \n- \n- \n-\ndiff --git a/androidll/app/src/main/res/drawable/ic_launcher_background.xml b/androidll/app/src/main/res/drawable/ic_launcher_background.xml\ndeleted file mode 100644\nindex d5fccc538..000000000\n--- a/androidll/app/src/main/res/drawable/ic_launcher_background.xml\n+++ /dev/null\n@@ -1,170 +0,0 @@\n-\n-\n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n-\ndiff --git a/androidll/app/src/main/res/drawable/splash.png b/androidll/app/src/main/res/drawable/splash.png\ndeleted file mode 100644\nindex f7a64923e..000000000\nBinary files a/androidll/app/src/main/res/drawable/splash.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/layout/activity_main.xml b/androidll/app/src/main/res/layout/activity_main.xml\ndeleted file mode 100644\nindex b5ad13870..000000000\n--- a/androidll/app/src/main/res/layout/activity_main.xml\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-\n-\n-\n- \n-\ndiff --git a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml\ndeleted file mode 100644\nindex 036d09bc5..000000000\n--- a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-\n-\n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml\ndeleted file mode 100644\nindex 036d09bc5..000000000\n--- a/androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-\n-\n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png\ndeleted file mode 100644\nindex c023e5059..000000000\nBinary files a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\ndeleted file mode 100644\nindex 2127973b2..000000000\nBinary files a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\ndeleted file mode 100644\nindex b441f37d6..000000000\nBinary files a/androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png\ndeleted file mode 100644\nindex 72905b854..000000000\nBinary files a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\ndeleted file mode 100644\nindex 8ed0605c2..000000000\nBinary files a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\ndeleted file mode 100644\nindex 9502e47a2..000000000\nBinary files a/androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png\ndeleted file mode 100644\nindex 4d1e07710..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\ndeleted file mode 100644\nindex df0f15880..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\ndeleted file mode 100644\nindex 853db043d..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\ndeleted file mode 100644\nindex 6cdf97c11..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\ndeleted file mode 100644\nindex 2960cbb61..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\ndeleted file mode 100644\nindex 8e3093a86..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\ndeleted file mode 100644\nindex 46de6e255..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\ndeleted file mode 100644\nindex d2ea9abed..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\ndeleted file mode 100644\nindex a40d73e9c..000000000\nBinary files a/androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ\ndiff --git a/androidll/app/src/main/res/values/ic_launcher_background.xml b/androidll/app/src/main/res/values/ic_launcher_background.xml\ndeleted file mode 100644\nindex c5d5899fd..000000000\n--- a/androidll/app/src/main/res/values/ic_launcher_background.xml\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-\n-\n- #FFFFFF\n-\n\\ No newline at end of file\ndiff --git a/androidll/app/src/main/res/values/strings.xml b/androidll/app/src/main/res/values/strings.xml\ndeleted file mode 100644\nindex 4b39c98c3..000000000\n--- a/androidll/app/src/main/res/values/strings.xml\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-\n-\n- capacitor-testapp\n- capacitor-testapp\n- com.capacitorjs.app.testapp\n- com.capacitorjs.app.testapp\n-\ndiff --git a/androidll/app/src/main/res/values/styles.xml b/androidll/app/src/main/res/values/styles.xml\ndeleted file mode 100644\nindex bb45498f6..000000000\n--- a/androidll/app/src/main/res/values/styles.xml\n+++ /dev/null\n@@ -1,22 +0,0 @@\n-\n-\n-\n- \n- \n-\n- \n-\n-\n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/app/src/main/res/xml/config.xml b/androidll/app/src/main/res/xml/config.xml\ndeleted file mode 100644\nindex 48aee8664..000000000\n--- a/androidll/app/src/main/res/xml/config.xml\n+++ /dev/null\n@@ -1,95 +0,0 @@\n-\n-\n- \n- \n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n-\n- \n- \n- \n- \n-\n- \n- \n- \n- \n-\n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/app/src/main/res/xml/file_paths.xml b/androidll/app/src/main/res/xml/file_paths.xml\ndeleted file mode 100644\nindex bd0c4d80d..000000000\n--- a/androidll/app/src/main/res/xml/file_paths.xml\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-\n-\n- \n- \n-\n\\ No newline at end of file\ndiff --git a/androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java\ndeleted file mode 100644\nindex 029732784..000000000\n--- a/androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-package com.getcapacitor.myapp;\n-\n-import static org.junit.Assert.*;\n-\n-import org.junit.Test;\n-\n-/**\n- * Example local unit test, which will execute on the development machine (host).\n- *\n- * @see Testing documentation\n- */\n-public class ExampleUnitTest {\n-\n- @Test\n- public void addition_isCorrect() throws Exception {\n- assertEquals(4, 2 + 2);\n- }\n-}\ndiff --git a/androidll/capacitor.settings.gradle b/androidll/capacitor.settings.gradle\ndeleted file mode 100644\nindex 229ab18e9..000000000\n--- a/androidll/capacitor.settings.gradle\n+++ /dev/null\n@@ -1,54 +0,0 @@\n-// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME \"capacitor update\" IS RUN\n-include ':capacitor-android'\n-project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')\n-\n-include ':byteowls-capacitor-filesharer'\n-project(':byteowls-capacitor-filesharer').projectDir = new File('../node_modules/@byteowls/capacitor-filesharer/android')\n-\n-include ':capacitor-community-camera-preview'\n-project(':capacitor-community-camera-preview').projectDir = new File('../node_modules/@capacitor-community/camera-preview/android')\n-\n-include ':capacitor-app'\n-project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')\n-\n-include ':capacitor-browser'\n-project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android')\n-\n-include ':capacitor-camera'\n-project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')\n-\n-include ':capacitor-device'\n-project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android')\n-\n-include ':capacitor-filesystem'\n-project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')\n-\n-include ':capacitor-haptics'\n-project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')\n-\n-include ':capacitor-keyboard'\n-project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')\n-\n-include ':capacitor-local-notifications'\n-project(':capacitor-local-notifications').projectDir = new File('../node_modules/@capacitor/local-notifications/android')\n-\n-include ':capacitor-network'\n-project(':capacitor-network').projectDir = new File('../node_modules/@capacitor/network/android')\n-\n-include ':capacitor-push-notifications'\n-project(':capacitor-push-notifications').projectDir = new File('../node_modules/@capacitor/push-notifications/android')\n-\n-include ':capacitor-share'\n-project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')\n-\n-include ':capacitor-storage'\n-project(':capacitor-storage').projectDir = new File('../node_modules/@capacitor/storage/android')\n-\n-include ':sentry-capacitor'\n-project(':sentry-capacitor').projectDir = new File('../node_modules/@sentry/capacitor/android')\n-\n-include ':capacitor-voice-recorder'\n-project(':capacitor-voice-recorder').projectDir = new File('../node_modules/capacitor-voice-recorder/android')\n-\n-include ':capacitor2-file-picker'\n-project(':capacitor2-file-picker').projectDir = new File('../node_modules/capacitor2-file-picker/android')\ndiff --git a/androidll/gradle/wrapper/gradle-wrapper.jar b/androidll/gradle/wrapper/gradle-wrapper.jar\ndeleted file mode 100644\nindex e708b1c02..000000000\nBinary files a/androidll/gradle/wrapper/gradle-wrapper.jar and /dev/null differ\ndiff --git a/androidll/gradlew.bat b/androidll/gradlew.bat\ndeleted file mode 100644\nindex 107acd32c..000000000\n--- a/androidll/gradlew.bat\n+++ /dev/null\n@@ -1,89 +0,0 @@\n-@rem\n-@rem Copyright 2015 the original author or authors.\n-@rem\n-@rem Licensed under the Apache License, Version 2.0 (the \"License\");\n-@rem you may not use this file except in compliance with the License.\n-@rem You may obtain a copy of the License at\n-@rem\n-@rem https://www.apache.org/licenses/LICENSE-2.0\n-@rem\n-@rem Unless required by applicable law or agreed to in writing, software\n-@rem distributed under the License is distributed on an \"AS IS\" BASIS,\n-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n-@rem See the License for the specific language governing permissions and\n-@rem limitations under the License.\n-@rem\n-\n-@if \"%DEBUG%\" == \"\" @echo off\n-@rem ##########################################################################\n-@rem\n-@rem Gradle startup script for Windows\n-@rem\n-@rem ##########################################################################\n-\n-@rem Set local scope for the variables with windows NT shell\n-if \"%OS%\"==\"Windows_NT\" setlocal\n-\n-set DIRNAME=%~dp0\n-if \"%DIRNAME%\" == \"\" set DIRNAME=.\n-set APP_BASE_NAME=%~n0\n-set APP_HOME=%DIRNAME%\n-\n-@rem Resolve any \".\" and \"..\" in APP_HOME to make it shorter.\n-for %%i in (\"%APP_HOME%\") do set APP_HOME=%%~fi\n-\n-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n-set DEFAULT_JVM_OPTS=\"-Xmx64m\" \"-Xms64m\"\n-\n-@rem Find java.exe\n-if defined JAVA_HOME goto findJavaFromJavaHome\n-\n-set JAVA_EXE=java.exe\n-%JAVA_EXE% -version >NUL 2>&1\n-if \"%ERRORLEVEL%\" == \"0\" goto execute\n-\n-echo.\n-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n-echo.\n-echo Please set the JAVA_HOME variable in your environment to match the\n-echo location of your Java installation.\n-\n-goto fail\n-\n-:findJavaFromJavaHome\n-set JAVA_HOME=%JAVA_HOME:\"=%\n-set JAVA_EXE=%JAVA_HOME%/bin/java.exe\n-\n-if exist \"%JAVA_EXE%\" goto execute\n-\n-echo.\n-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%\n-echo.\n-echo Please set the JAVA_HOME variable in your environment to match the\n-echo location of your Java installation.\n-\n-goto fail\n-\n-:execute\n-@rem Setup the command line\n-\n-set CLASSPATH=%APP_HOME%\\gradle\\wrapper\\gradle-wrapper.jar\n-\n-\n-@rem Execute Gradle\n-\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \"-Dorg.gradle.appname=%APP_BASE_NAME%\" -classpath \"%CLASSPATH%\" org.gradle.wrapper.GradleWrapperMain %*\n-\n-:end\n-@rem End local scope for the variables with windows NT shell\n-if \"%ERRORLEVEL%\"==\"0\" goto mainEnd\n-\n-:fail\n-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of\n-rem the _cmd.exe /c_ return code!\n-if not \"\" == \"%GRADLE_EXIT_CONSOLE%\" exit 1\n-exit /b 1\n-\n-:mainEnd\n-if \"%OS%\"==\"Windows_NT\" endlocal\n-\n-:omega\ndiff --git a/package-lock.json b/package-lock.json\nindex dec677ac1..31fc92e69 100644\n--- a/package-lock.json\n+++ b/package-lock.json\n@@ -32,7 +32,7 @@\n \"@awesome-cordova-plugins/multiple-document-picker\": \"^5.40.0\",\n \"@byteowls/capacitor-filesharer\": \"^3.0.0\",\n \"@capacitor-community/camera-preview\": \"^1.2.1\",\n- \"@capacitor/android\": \"3.6.0\",\n+ \"@capacitor/android\": \"^3.3.2\",\n \"@capacitor/app\": \"^1.0.5\",\n \"@capacitor/browser\": \"1.0.6\",\n \"@capacitor/camera\": \"^1.2.0\",\n@@ -3281,10 +3281,11 @@\n }\n },\n \"node_modules/@capacitor/android\": {\n- \"version\": \"3.6.0\",\n- \"license\": \"MIT\",\n+ \"version\": \"3.3.2\",\n+ \"resolved\": \"https://registry.npmjs.org/@capacitor/android/-/android-3.3.2.tgz\",\n+ \"integrity\": \"sha512-TG+tGz0KxkT/BgvSLQfbQwQ9c4Budub5TRijIGdmMbB1ZYB76TFhwvVuwWZ52HFSlKS3sx/UYLlbULL7UQ2aug==\",\n \"peerDependencies\": {\n- \"@capacitor/core\": \"^3.6.0\"\n+ \"@capacitor/core\": \"^3.3.0\"\n }\n },\n \"node_modules/@capacitor/app\": {\n@@ -40044,7 +40045,9 @@\n }\n },\n \"@capacitor/android\": {\n- \"version\": \"3.6.0\",\n+ \"version\": \"3.3.2\",\n+ \"resolved\": \"https://registry.npmjs.org/@capacitor/android/-/android-3.3.2.tgz\",\n+ \"integrity\": \"sha512-TG+tGz0KxkT/BgvSLQfbQwQ9c4Budub5TRijIGdmMbB1ZYB76TFhwvVuwWZ52HFSlKS3sx/UYLlbULL7UQ2aug==\",\n \"requires\": {}\n },\n \"@capacitor/app\": {\ndiff --git a/package.json b/package.json\nindex d58502e94..9cede9b70 100644\n--- a/package.json\n+++ b/package.json\n@@ -41,7 +41,7 @@\n \"@awesome-cordova-plugins/multiple-document-picker\": \"^5.40.0\",\n \"@byteowls/capacitor-filesharer\": \"^3.0.0\",\n \"@capacitor-community/camera-preview\": \"^1.2.1\",\n- \"@capacitor/android\": \"3.6.0\",\n+ \"@capacitor/android\": \"^3.3.2\",\n \"@capacitor/app\": \"^1.0.5\",\n \"@capacitor/browser\": \"1.0.6\",\n \"@capacitor/camera\": \"^1.2.0\",\ndiff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts\nindex 13c40610e..19f88dcc5 100644\n--- a/src/app/guards/auth.guard.ts\n+++ b/src/app/guards/auth.guard.ts\n@@ -22,7 +22,7 @@ export class AuthGuard implements CanActivate {\n route: ActivatedRouteSnapshot,\n state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree {\n \n- console.log('hire inactinity!', state.url)\n+ console.log('hire auth!', state.url)\n \n // if user not active or no session\n if(!SessionStore.user.Inactivity || !SessionStore.exist) {\n@@ -31,6 +31,7 @@ export class AuthGuard implements CanActivate {\n this.router.navigate(['/pin']);\n } else {\n this.router.navigate(['/']);\n+ // console.log('goto login page')\n }\n \n return false\ndiff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts\nindex dc3895e34..b51d78918 100644\n--- a/src/app/guards/inactivity.guard.ts\n+++ b/src/app/guards/inactivity.guard.ts\n@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';\n import { SessionStore } from '../store/session.service';\n import { AlertController, Platform } from '@ionic/angular';\n import { PermissionService } from '../services/permission.service';\n+import { FirstEnterService } from '../services/first-enter.service';\n \n @Injectable({\n providedIn: 'root'\n@@ -14,7 +15,8 @@ export class InactivityGuard implements CanActivate {\n private router:Router,\n private platform: Platform,\n public p: PermissionService,\n- private alertController: AlertController\n+ private alertController: AlertController,\n+ private FirstEnterService: FirstEnterService\n ) {}\n \n canActivate(\n@@ -24,30 +26,8 @@ export class InactivityGuard implements CanActivate {\n console.log('hire inactinity!', state.url)\n \n if ( (this.platform.is('desktop') || this.platform.is('mobileweb')) ) {\n- if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){\n- \n- }\n- else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){\n- this.router.navigate(['/home/chat']);\n- }\n- else if(this.p.userPermission(this.p.permissionList.Actions.access)) {\n- this.router.navigate(['/home/publications']);\n- } else {\n-\n- this.alertController.create({\n- cssClass: 'my-custom-class',\n- header: 'Utilizador sem acesso a aplicação',\n- buttons: [{\n- text: 'Ok',\n- handler: () => {\n-\n- }\n- }]\n- }).then( async (alertPopup) => {\n- await alertPopup.present();\n- })\n-\n- }\n+ \n+ this.FirstEnterService.enter()\n \n return false\n } else if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin ) {\n@@ -68,28 +48,8 @@ export class InactivityGuard implements CanActivate {\n else {\n \n if((SessionStore?.user?.Inactivity)) {\n- if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){\n- this.router.navigate(['/home/events']);\n- }\n- else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){\n- this.router.navigate(['/home/chat']);\n- }\n- else if(this.p.userPermission(this.p.permissionList.Actions.access)){\n- this.router.navigate(['/home/publications']);\n- } else {\n- this.alertController.create({\n- cssClass: 'my-custom-class',\n- header: 'Utilizador sem acesso a aplicação',\n- buttons: [{\n- text: 'Ok',\n- handler: () => {\n- \n- }\n- }]\n- }).then( async (alertPopup)=>{\n- await alertPopup.present();\n- })\n- }\n+ this.FirstEnterService.enter()\n+ \n return false\n }\n \ndiff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts\nindex f436776da..d4aceeb71 100644\n--- a/src/app/home/home-routing.module.ts\n+++ b/src/app/home/home-routing.module.ts\n@@ -2,6 +2,11 @@ import { NgModule } from '@angular/core';\n import { Routes, RouterModule } from '@angular/router';\n import { AuthGuard } from '../guards/auth.guard';\n import { InactivityGuard } from '../guards/inactivity.guard';\n+import { AgendaPageModule } from '../pages/agenda/agenda.module';\n+import { ChatPageModule } from '../pages/chat/chat.module';\n+import { EventsPageModule } from '../pages/events/events.module';\n+import { GabineteDigitalPageModule } from '../pages/gabinete-digital/gabinete-digital.module';\n+import { PublicationsPageModule } from '../pages/publications/publications.module';\n import { UserDataResolver } from '../resolvers/userData.resolver';\n import { HomePage } from './home.page';\n \n@@ -18,7 +23,7 @@ const routes: Routes = [\n children: [\n {\n path:'',\n- loadChildren: ()=> import('../pages/events/events.module').then(m => m.EventsPageModule)\n+ loadChildren: ()=> EventsPageModule\n },\n {\n path:':eventId/:caller',\n@@ -80,7 +85,7 @@ const routes: Routes = [\n children: [\n {\n path:'',\n- loadChildren: ()=> import('../pages/agenda/agenda.module').then(m => m.AgendaPageModule)\n+ loadChildren: () => AgendaPageModule\n },\n {\n path:':eventId/:caller',\n@@ -128,7 +133,7 @@ const routes: Routes = [\n children: [\n {\n path:'',\n- loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule)\n+ loadChildren: ()=> GabineteDigitalPageModule\n },\n {\n path:'expediente',\n@@ -290,7 +295,7 @@ const routes: Routes = [\n children: [\n {\n path:'',\n- loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule)\n+ loadChildren: ()=> PublicationsPageModule\n },\n {\n path:':folderId',\n@@ -321,7 +326,7 @@ const routes: Routes = [\n children: [\n {\n path:'',\n- loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)\n+ loadChildren: ()=> ChatPageModule\n },\n {\n path:'messages',\ndiff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts\nindex ec0339a1d..1caeb8499 100644\n--- a/src/app/home/home.page.ts\n+++ b/src/app/home/home.page.ts\n@@ -1,5 +1,3 @@\n-/* eslint-disable */\n-/* tslint:disable */\n import { Component, OnInit } from '@angular/core';\n import { Event } from '../models/event.model';\n import { NotificationsService } from '../services/notifications.service';\n@@ -97,7 +95,7 @@ export class HomePage implements OnInit {\n this.router.events.subscribe((val) => {\n document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())\n document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())\n- document.querySelectorAll('.notification').forEach((e: any) => e.remove())\n+ document.querySelectorAll('.loading-blocker').forEach((e: any) => e.remove())\n });\n \n window['platform'] = platform\ndiff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts\nindex 896305f11..9cecd6159 100644\n--- a/src/app/models/beast-orm.ts\n+++ b/src/app/models/beast-orm.ts\n@@ -9,6 +9,7 @@ export class MessageModel extends models.Model {\n \tchannels = ArrayField()\n \tmentions = ArrayField()\n \tmsg = models.CharField()\n+\tsendAttempt = models.IntegerField()\n \trid = models.CharField()\n \tts = JsonField({blank:true})\n \tu = JsonField()\n@@ -37,7 +38,7 @@ export class DeleteMessageModel extends models.Model {\n models.register({\n databaseName: 'chat-storage',\n type: 'indexedDB',\n- version: 4,\n+ version: 5,\n models: [MessageModel, DeleteMessageModel]\n })\n \ndiff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html\nindex fdfdc6f16..71a52a718 100644\n--- a/src/app/pages/chat/group-messages/group-messages.page.html\n+++ b/src/app/pages/chat/group-messages/group-messages.page.html\n@@ -63,10 +63,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n {{last ? scrollToBottom() : ''}}\n \n@@ -101,10 +102,11 @@\n \"image\"\n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n
\n@@ -158,6 +160,7 @@\n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n
\n \ndiff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss\nindex 89849c416..7ee672bb2 100644\n--- a/src/app/pages/chat/group-messages/group-messages.page.scss\n+++ b/src/app/pages/chat/group-messages/group-messages.page.scss\n@@ -387,3 +387,11 @@\n .float-status-all {\n font-size: 10pt !important;\n }\n+\n+.try {\n+ color: red;\n+ background: #f3414159;\n+ padding: 6px;\n+ border-radius: 10px;\n+ cursor: pointer;\n+}\n\\ No newline at end of file\ndiff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html\nindex 745e00f99..ea77dd2d7 100644\n--- a/src/app/pages/chat/messages/messages.page.html\n+++ b/src/app/pages/chat/messages/messages.page.html\n@@ -60,10 +60,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n {{last ? scrollToBottom() : ''}}\n@@ -96,10 +97,11 @@\n \"image\"\n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n \n@@ -161,10 +163,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n \ndiff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss\nindex 5283f4d58..d4f77f639 100644\n--- a/src/app/pages/chat/messages/messages.page.scss\n+++ b/src/app/pages/chat/messages/messages.page.scss\n@@ -356,3 +356,11 @@ button::-moz-focus-inner {\n .float-status-all {\n font-size: 10pt !important;\n }\n+\n+.try {\n+ color: red;\n+ background: #f3414159;\n+ padding: 6px;\n+ border-radius: 10px;\n+ cursor: pointer;\n+}\n\\ No newline at end of file\ndiff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..113534216 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -280,9 +280,11 @@ export class EventsPage implements OnInit {\n }\n })\n this.listToPresent = todayEvents\n- this.totalEvent = this.listToPresent.length\n- this.currentEvent = this.listToPresent[0].Subject\n- this.currentHoursMinutes = this.listToPresent[0].StartDate\n+ if(this.listToPresent?.length) {\n+ this.totalEvent = this.listToPresent.length\n+ this.currentEvent = this.listToPresent[0].Subject\n+ this.currentHoursMinutes = this.listToPresent[0].StartDate\n+ }\n // \n })\n \ndiff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts\nindex 7b0fd417a..f0a349109 100644\n--- a/src/app/pages/login/login.page.ts\n+++ b/src/app/pages/login/login.page.ts\n@@ -16,7 +16,7 @@ import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-co\n import { ChatSystemService } from 'src/app/services/chat/chat-system.service';\n import { ChatService } from 'src/app/services/chat.service';\n import { Platform } from '@ionic/angular';\n-\n+import { FirstEnterService } from '../../services/first-enter.service';\n \n @Component({\n selector: 'app-login',\n@@ -52,10 +52,13 @@ export class LoginPage implements OnInit {\n public ChatSystemService: ChatSystemService,\n private ChatService: ChatService,\n private platform: Platform,\n- ) {}\n+ private FirstEnterService: FirstEnterService\n+ ) {\n+ console.log('constructor')\n+ }\n \n ngOnInit() {\n-\n+ console.log('ngOngInit')\n }\n \n togglePassword() {\n@@ -68,7 +71,6 @@ export class LoginPage implements OnInit {\n }\n \n }\n- //\n \n //Function to validade the login inputs\n validateUsername() {\n@@ -134,7 +136,7 @@ export class LoginPage implements OnInit {\n }\n \n this.changeProfileService.runLogin();\n- this.getToken();\n+ // this.getToken();\n SessionStore.setInativity(true);\n \n this.goback();\n@@ -160,7 +162,7 @@ export class LoginPage implements OnInit {\n this.ChatSystemService.loadChat();\n }\n \n- this.getToken();\n+ // this.getToken();\n \n if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) {\n if(this.sessionStore.hasPin) {\n@@ -196,22 +198,7 @@ export class LoginPage implements OnInit {\n if(pathName) {\n this.router.navigate([pathName]);\n } else {\n- if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){\n- //When user has got access to Agenda but does not have their own calendar, goes to Agenda\n- if(this.p.userPermission(this.p.permissionList.Agenda.access) && SessionStore.user.OwnerCalendars.length == 0){\n- this.router.navigate(['/home/agenda']);\n- }\n- else{\n- this.router.navigate(['/home/events']);\n- }\n- }\n- //If user has access permission to both Chat and Action, goes to Chat by default.\n- else if((this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)) || this.p.userPermission(this.p.permissionList.Chat.access)){\n- this.router.navigate(['/home/chat']);\n- }\n- else if(this.p.userPermission(this.p.permissionList.Actions.access)){\n- this.router.navigate(['/home/publications']);\n- }\n+ this.FirstEnterService.enter()\n }\n \n }\ndiff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts\nindex 522d5fda5..30d87b280 100644\n--- a/src/app/services/chat/message.service.ts\n+++ b/src/app/services/chat/message.service.ts\n@@ -59,6 +59,7 @@ export class MessageService {\n downloadAttachments = false;\n downloadAttachmentsTemp = 0;\n UploadAttachmentsTemp = 0;\n+ manualRetry = false\n \n constructor(\n private NfService: NfService,\n@@ -215,6 +216,9 @@ export class MessageService {\n \n }\n \n+\n+ functionTimer = null;\n+\n async sendRequest(params) {\n \n if(params?.attachments) {\n@@ -228,16 +232,41 @@ export class MessageService {\n this.RochetChatConnectorService.send(params).then(\n (ChatMessage: any) => {\n ChatMessage = ChatMessage.message.result\n+ clearTimeout(this.functionTimer);\n \n this.messageSend = true\n this.redefinedMessage(ChatMessage)\n+ \n }\n ).catch((error) => {\n+ clearTimeout(this.functionTimer);\n console.error(error)\n })\n+ \n+ this.functionTimer = setTimeout(() => {\n+\n+ this.RochetChatConnectorService.registerCallback({\n+ type:'Onmessage',\n+ key:'ping-pong-message',\n+ funx:(message: any) => {\n+ if(message.msg == \"ping\") {\n+ if(this.sendAttempt >= 3) {\n+ this.manualRetry = true\n+ } else {\n+ this.send()\n+ }\n+ return true\n+ }\n+\n+ this.save()\n+ }\n+ })\n+\n+ this.RochetChatConnectorService.wsSend({message:{msg:\"pong\"}, loginRequired: false})\n+\n+ }, 8000)\n \n } else {\n- // console.log(\"reconnect\")\n this.RochetChatConnectorService.registerCallback({\n type: 'reConnect',\n funx: async ()=> {\n@@ -335,6 +364,7 @@ export class MessageService {\n channels: this.channels,\n mentions: this.mentions,\n //msg: this.AESEncrypt.encrypt(this.msg, SessionStore.user.UserName),\n+ sendAttempt: this.sendAttempt,\n msg:this.msg,\n rid: this.rid,\n ts: this.ts,\ndiff --git a/src/app/services/chat/rochet-chat-connector.service.ts b/src/app/services/chat/rochet-chat-connector.service.ts\nindex c28afb167..0893f0f51 100644\n--- a/src/app/services/chat/rochet-chat-connector.service.ts\n+++ b/src/app/services/chat/rochet-chat-connector.service.ts\n@@ -46,6 +46,10 @@ export class RochetChatConnectorService {\n \n }\n \n+ wsSend({message, requestId = uuidv4(), loginRequired = true}:send) {\n+ this.ws.send({message:{msg:\"pong\"}, loginRequired: false})\n+ }\n+\n login() {\n // dont login if is already login\n if(this.isLogin == true) {\n@@ -739,7 +743,7 @@ export class RochetChatConnectorService {\n } else {\n let messageStr = JSON.stringify(message)\n // \n- // console.log(messageStr)\n+ console.log(messageStr)\n this.socket.send(messageStr)\n }\n return requestId\n@@ -747,6 +751,8 @@ export class RochetChatConnectorService {\n \n onmessage: async (event: any)=> {\n const data = JSON.parse(event.data)\n+ \n+ console.log('data', data)\n \n for (const [key, value] of Object.entries(this.wsCallbacks)) {\n if(value.type== 'Onmessage') {\ndiff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html\nindex 93f1f1580..25ac6a487 100644\n--- a/src/app/shared/chat/group-messages/group-messages.page.html\n+++ b/src/app/shared/chat/group-messages/group-messages.page.html\n@@ -59,10 +59,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n {{last ? scrollToBottom() : ''}}\n \n@@ -104,10 +105,11 @@\n \"image\"\n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n \n@@ -158,10 +160,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n \ndiff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss\nindex 8df9dee88..c847864ad 100644\n--- a/src/app/shared/chat/group-messages/group-messages.page.scss\n+++ b/src/app/shared/chat/group-messages/group-messages.page.scss\n@@ -321,3 +321,12 @@\n .float-status-all {\n font-size: 10pt !important;\n }\n+\n+\n+.try {\n+ color: red;\n+ background: #f3414159;\n+ padding: 6px;\n+ border-radius: 10px;\n+ cursor: pointer;\n+}\n\\ No newline at end of file\ndiff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html\nindex f4236f3bd..3392a0e4e 100644\n--- a/src/app/shared/chat/messages/messages.page.html\n+++ b/src/app/shared/chat/messages/messages.page.html\n@@ -60,10 +60,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n {{last ? scrollToBottom() : ''}}\n \n@@ -103,10 +104,11 @@\n \"image\"\n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n \n
\n@@ -168,10 +170,11 @@\n \n \n \n- \n+ \n \n = 1 && msg.viewed.length == 0\" src=\"assets/images/check-double-solid.svg\">\n = 1\" src=\"assets/images/check-double-solid -viewed.svg\">\n+
Tentar
\n \n
\n \ndiff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss\nindex 2d4bb8fb7..9349b4c69 100644\n--- a/src/app/shared/chat/messages/messages.page.scss\n+++ b/src/app/shared/chat/messages/messages.page.scss\n@@ -388,4 +388,13 @@ ion-footer {\n .audioButtonPlay {\n margin-bottom: 100%;\n right: 50%;\n+}\n+\n+\n+.try {\n+ color: red;\n+ background: #f3414159;\n+ padding: 6px;\n+ border-radius: 10px;\n+ cursor: pointer;\n }\n\\ No newline at end of file\ndiff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts\nindex 9a9e9487f..ade54d692 100644\n--- a/src/app/shared/chat/messages/messages.page.ts\n+++ b/src/app/shared/chat/messages/messages.page.ts\n@@ -32,7 +32,6 @@ import { File } from '@awesome-cordova-plugins/file/ngx';\n import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';\n import { SessionStore } from 'src/app/store/session.service';\n import { Howl } from 'howler';\n-import { runInThisContext } from 'vm';\n import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';\n import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page';\n \ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 50f15c66e..ba56d63fc 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,12 +1,15 @@\n import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex 57721f3a5..f643c390c 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -14,9 +14,9 @@ export const environment = {\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n production: true,\n- domain: 'gabinetedigital.local',\n+ domain: 'paulo.pinto@gabinetedigital.local',\n defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local\n- defaultuserpwd: 'M@p2022', //tabteste@006,\n+ defaultuserpwd: 'tabteste@006', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n version: versionData,", + "changeStatus": "On branch develop_bitOut-fix\nChanges not staged for commit:\n (use \"git add/rm ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tdeleted: androidll/.gitignore\n\tdeleted: androidll/.idea/compiler.xml\n\tdeleted: androidll/.idea/encodings.xml\n\tdeleted: androidll/.idea/jarRepositories.xml\n\tdeleted: androidll/.idea/misc.xml\n\tdeleted: androidll/app/.gitignore\n\tdeleted: androidll/app/capacitor.build.gradle\n\tdeleted: androidll/app/proguard-rules.pro\n\tdeleted: androidll/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java\n\tdeleted: androidll/app/src/main/AndroidManifest.xml\n\tdeleted: androidll/app/src/main/assets/capacitor.config.json\n\tdeleted: androidll/app/src/main/assets/capacitor.plugins.json\n\tdeleted: androidll/app/src/main/res/drawable-land-hdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-land-mdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-land-xhdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-land-xxhdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-land-xxxhdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-port-hdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-port-mdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-port-xhdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-port-xxhdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-port-xxxhdpi/splash.png\n\tdeleted: androidll/app/src/main/res/drawable-v24/ic_launcher_foreground.xml\n\tdeleted: androidll/app/src/main/res/drawable/ic_launcher_background.xml\n\tdeleted: androidll/app/src/main/res/drawable/splash.png\n\tdeleted: androidll/app/src/main/res/layout/activity_main.xml\n\tdeleted: androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml\n\tdeleted: androidll/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml\n\tdeleted: androidll/app/src/main/res/mipmap-hdpi/ic_launcher.png\n\tdeleted: androidll/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\n\tdeleted: androidll/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\n\tdeleted: androidll/app/src/main/res/mipmap-mdpi/ic_launcher.png\n\tdeleted: androidll/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\n\tdeleted: androidll/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\n\tdeleted: androidll/app/src/main/res/mipmap-xhdpi/ic_launcher.png\n\tdeleted: androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\n\tdeleted: androidll/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\n\tdeleted: androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\n\tdeleted: androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\n\tdeleted: androidll/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\n\tdeleted: androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\n\tdeleted: androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\n\tdeleted: androidll/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\n\tdeleted: androidll/app/src/main/res/values/ic_launcher_background.xml\n\tdeleted: androidll/app/src/main/res/values/strings.xml\n\tdeleted: androidll/app/src/main/res/values/styles.xml\n\tdeleted: androidll/app/src/main/res/xml/config.xml\n\tdeleted: androidll/app/src/main/res/xml/file_paths.xml\n\tdeleted: androidll/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java\n\tdeleted: androidll/capacitor.settings.gradle\n\tdeleted: androidll/gradle/wrapper/gradle-wrapper.jar\n\tdeleted: androidll/gradlew.bat\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/guards/inactivity.guard.ts\n\tmodified: src/app/home/home-routing.module.ts\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\nUntracked files:\n (use \"git add ...\" to include in what will be committed)\n\tsrc/app/services/first-enter.service.spec.ts\n\tsrc/app/services/first-enter.service.ts\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")", "changeAuthor": "peter.maquiran" } \ No newline at end of file