mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 05:45:50 +00:00
Merge remote-tracking branch 'origin/feature/pushNotifications' into developer
This commit is contained in:
tiago.kayaya
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Generated
+6
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="1.8" />
|
||||
</component>
|
||||
</project>
|
||||
Generated
+2
-1
@@ -7,7 +7,7 @@
|
||||
<option name="testRunner" value="PLATFORM" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleHome" value="C:/../Gradle/gradle-6.6" />
|
||||
<option name="gradleHome" value="$PROJECT_DIR$/../../../../../../../Gradle/gradle-6.6" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
@@ -17,6 +17,7 @@
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
<option name="useQualifiedModuleNames" value="true" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
|
||||
Generated
+51
-24
@@ -16,6 +16,8 @@
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
@@ -277,19 +279,17 @@
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.bin" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/taskHistory.bin" afterDir="false" />
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" afterDir="false" />
|
||||
@@ -315,11 +315,14 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
|
||||
>>>>>>> feature/pushNotifications
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js.map" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js.map" afterDir="false" />
|
||||
@@ -560,8 +563,12 @@
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es5.js" afterDir="false" />
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js.map" afterDir="false" />
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" afterDir="false" />
|
||||
@@ -625,10 +632,14 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||
>>>>>>> feature/chat
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" afterDir="false" />
|
||||
@@ -661,15 +672,13 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js.map" afterDir="false" />
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_0.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_1.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_3.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values_values.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values_values.arsc.flat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" afterDir="false" />
|
||||
@@ -1037,8 +1046,12 @@
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es5.js" afterDir="false" />
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js.map" afterDir="false" />
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" afterDir="false" />
|
||||
@@ -1102,10 +1115,15 @@
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||
>>>>>>> feature/chat
|
||||
>>>>>>> developer
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/home/home.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/home/home.page.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../src/app/pages/login/login.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/pages/login/login.page.ts" afterDir="false" />
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" afterDir="false" />
|
||||
@@ -1260,12 +1278,16 @@
|
||||
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/res/xml/camera_provider_paths.xml" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/res/xml/camera_provider_paths.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/capacitor.settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor.settings.gradle" afterDir="false" />
|
||||
>>>>>>> feature/chat
|
||||
>>>>>>> developer
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<<<<<<< HEAD
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[32014983dd0a168b]" />
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="XU020961" />
|
||||
@@ -1275,6 +1297,7 @@
|
||||
=======
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_27" />
|
||||
>>>>>>> feature/chat
|
||||
>>>>>>> developer
|
||||
<component name="ExternalProjectsData">
|
||||
<projectState path="$PROJECT_DIR$">
|
||||
<ProjectState />
|
||||
@@ -1406,30 +1429,34 @@
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="496" y="56" key="#app/0.0.1536.824/0.-1080.1920.1040@0.0.1536.824" timestamp="1610719107702" />
|
||||
<state x="144" y="124" width="1200" height="584" key="AVDManager" timestamp="1611170218435">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="144" y="124" width="1200" height="584" key="AVDManager/0.0.1536.824@0.0.1536.824" timestamp="1611170218435" />
|
||||
<state x="525" y="171" key="FileChooserDialogImpl" timestamp="1611151674810">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="525" y="171" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1611151674810" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.bottom" timestamp="1611154209550">
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.bottom" timestamp="1611326775429">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="598" height="199" key="GridCell.Tab.0.bottom/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055540" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611154209550" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.center" timestamp="1611154209550">
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611326775429" />
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.center" timestamp="1611326775429">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="598" height="199" key="GridCell.Tab.0.center/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055539" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611154209550" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.left" timestamp="1611154209549">
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611326775429" />
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.left" timestamp="1611326775428">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="598" height="199" key="GridCell.Tab.0.left/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055539" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611154209549" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.right" timestamp="1611154209550">
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611326775428" />
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.right" timestamp="1611326775429">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="598" height="199" key="GridCell.Tab.0.right/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055540" />
|
||||
<state width="1340" height="335" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611154209550" />
|
||||
<state width="1340" height="471" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611326775429" />
|
||||
<state x="540" y="292" key="com.intellij.ide.util.TipDialog" timestamp="1610717874136">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
|
||||
+3
@@ -75,6 +75,9 @@
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths" />
|
||||
<meta-data
|
||||
android:name="com.google.firebase.messaging.default_notification_icon"
|
||||
android:resource="@mipmap/ic_launcher" />
|
||||
</provider>
|
||||
|
||||
<service
|
||||
|
||||
+4
@@ -1,4 +1,8 @@
|
||||
<<<<<<< HEAD
|
||||
#Fri Jan 22 15:57:55 WAT 2021
|
||||
=======
|
||||
#Wed Jan 27 16:51:16 WAT 2021
|
||||
>>>>>>> developer
|
||||
path.3=classes_1.dex
|
||||
path.2=classes_0.dex
|
||||
path.1=classes.dex
|
||||
|
||||
BIN
Binary file not shown.
@@ -76,6 +76,9 @@
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths" />
|
||||
<meta-data
|
||||
android:name="com.google.firebase.messaging.default_notification_icon"
|
||||
android:resource="@mipmap/ic_launcher" />
|
||||
</provider>
|
||||
|
||||
<service
|
||||
|
||||
+255
@@ -13,6 +13,44 @@
|
||||
11 <!-- Permissions -->
|
||||
12
|
||||
13 <uses-permission android:name="android.permission.INTERNET" />
|
||||
<<<<<<< HEAD
|
||||
13-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:5-67
|
||||
13-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:22-64
|
||||
14 <!-- Camera, Photos, input file -->
|
||||
15 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
15-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:5-79
|
||||
15-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:22-77
|
||||
16 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
16-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:5-81
|
||||
16-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:22-78
|
||||
17 <!-- Geolocation API -->
|
||||
18 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||
18-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:5-81
|
||||
18-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:22-78
|
||||
19 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||
19-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:5-79
|
||||
19-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:22-76
|
||||
20
|
||||
21 <uses-feature android:name="android.hardware.location.gps" />
|
||||
21-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:5-66
|
||||
21-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:19-63
|
||||
22 <!-- Network API -->
|
||||
23 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
23-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:5-79
|
||||
23-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:22-76
|
||||
24 <!-- Navigator.getUserMedia -->
|
||||
25 <!-- Video -->
|
||||
26 <uses-permission android:name="android.permission.CAMERA" />
|
||||
26-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:5-65
|
||||
26-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:22-62
|
||||
27 <!-- Audio -->
|
||||
28 <uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
28-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:5-71
|
||||
28-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:22-68
|
||||
29 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||
29-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:5-79
|
||||
29-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:22-77
|
||||
=======
|
||||
13-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:47:5-67
|
||||
13-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:47:22-64
|
||||
14 <!-- Camera, Photos, input file -->
|
||||
@@ -49,6 +87,7 @@
|
||||
29 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||
29-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:5-79
|
||||
29-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:22-77
|
||||
>>>>>>> developer
|
||||
30
|
||||
31 <uses-feature
|
||||
31-->[:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-13:36
|
||||
@@ -68,7 +107,11 @@
|
||||
37-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:26:22-79
|
||||
38
|
||||
39 <application
|
||||
<<<<<<< HEAD
|
||||
39-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-44:19
|
||||
=======
|
||||
39-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-43:19
|
||||
>>>>>>> developer
|
||||
40 android:allowBackup="true"
|
||||
40-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:6:9-35
|
||||
41 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
|
||||
@@ -140,6 +183,217 @@
|
||||
76 android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
76-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:40:17-67
|
||||
77 android:resource="@xml/file_paths" />
|
||||
<<<<<<< HEAD
|
||||
77-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:41:17-51
|
||||
78 <meta-data
|
||||
78-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:13-136
|
||||
79 android:name="com.google.firebase.messaging.default_notification_icon"
|
||||
79-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:24-94
|
||||
80 android:resource="@mipmap/ic_launcher" />
|
||||
80-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:95-133
|
||||
81 </provider>
|
||||
82
|
||||
83 <service
|
||||
83-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:19:9-21:40
|
||||
84 android:name="com.getcapacitor.plugin.background.BackgroundTaskService"
|
||||
84-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:20:13-84
|
||||
85 android:exported="false" />
|
||||
85-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:13-37
|
||||
86
|
||||
87 <receiver android:name="com.getcapacitor.plugin.notification.TimedNotificationPublisher" />
|
||||
87-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:9-100
|
||||
87-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:19-97
|
||||
88 <receiver android:name="com.getcapacitor.plugin.notification.NotificationDismissReceiver" />
|
||||
88-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:9-101
|
||||
88-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:24:19-98
|
||||
89
|
||||
90 <meta-data
|
||||
90-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:26:9-28:37
|
||||
91 android:name="firebase_messaging_auto_init_enabled"
|
||||
91-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:27:13-64
|
||||
92 android:value="false" />
|
||||
92-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:28:13-34
|
||||
93
|
||||
94 <service
|
||||
94-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:30:9-36:19
|
||||
95 android:name="com.getcapacitor.CapacitorFirebaseMessagingService"
|
||||
95-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:31:13-78
|
||||
96 android:stopWithTask="false" >
|
||||
96-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:32:13-41
|
||||
97 <intent-filter>
|
||||
97-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:13-35:29
|
||||
98 <action android:name="com.google.firebase.MESSAGING_EVENT" />
|
||||
98-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
|
||||
98-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
|
||||
99 </intent-filter>
|
||||
100 </service>
|
||||
101
|
||||
102 <receiver
|
||||
102-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:38:9-47:20
|
||||
103 android:name="com.getcapacitor.plugin.notification.LocalNotificationRestoreReceiver"
|
||||
103-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:39:13-97
|
||||
104 android:directBootAware="true"
|
||||
104-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:40:13-43
|
||||
105 android:exported="false" >
|
||||
105-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:41:13-37
|
||||
106 <intent-filter>
|
||||
106-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:42:13-46:29
|
||||
107 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
|
||||
107-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:43:17-86
|
||||
107-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:43:25-83
|
||||
108 <action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
108-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:44:17-79
|
||||
108-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:44:25-76
|
||||
109 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
|
||||
109-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:17-82
|
||||
109-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:45:25-79
|
||||
110 </intent-filter>
|
||||
111 </receiver>
|
||||
112
|
||||
113 <provider
|
||||
113-->[:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:9-24:20
|
||||
114 android:name="org.apache.cordova.camera.FileProvider"
|
||||
114-->[:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:17:13-66
|
||||
115 android:authorities="com.gpr.gabinetedigital.cordova.plugin.camera.provider"
|
||||
115-->[:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:13-82
|
||||
116 android:exported="false"
|
||||
116-->[:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:19:13-37
|
||||
117 android:grantUriPermissions="true" >
|
||||
117-->[:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:20:13-47
|
||||
118 <meta-data
|
||||
118-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:39:13-41:64
|
||||
119 android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
119-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:40:17-67
|
||||
120 android:resource="@xml/camera_provider_paths" />
|
||||
120-->C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:41:17-51
|
||||
121 </provider>
|
||||
122 <!--
|
||||
123 FirebaseMessagingService performs security checks at runtime,
|
||||
124 but set to not exported to explicitly avoid allowing another app to call it.
|
||||
125 -->
|
||||
126 <service
|
||||
126-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:28:9-34:19
|
||||
127 android:name="com.google.firebase.messaging.FirebaseMessagingService"
|
||||
127-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:29:13-82
|
||||
128 android:exported="false" >
|
||||
128-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:30:13-37
|
||||
129 <intent-filter android:priority="-500" >
|
||||
129-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:13-35:29
|
||||
130 <action android:name="com.google.firebase.MESSAGING_EVENT" />
|
||||
130-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:17-78
|
||||
130-->[:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:25-75
|
||||
131 </intent-filter>
|
||||
132 </service>
|
||||
133 <service
|
||||
133-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:35:9-41:19
|
||||
134 android:name="com.google.firebase.components.ComponentDiscoveryService"
|
||||
134-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:36:13-84
|
||||
135 android:directBootAware="true"
|
||||
135-->[com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:34:13-43
|
||||
136 android:exported="false" >
|
||||
136-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:37:13-37
|
||||
137 <meta-data
|
||||
137-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:38:13-40:85
|
||||
138 android:name="com.google.firebase.components:com.google.firebase.messaging.FirebaseMessagingRegistrar"
|
||||
138-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:39:17-119
|
||||
139 android:value="com.google.firebase.components.ComponentRegistrar" />
|
||||
139-->[com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:40:17-82
|
||||
140 <meta-data
|
||||
140-->[com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:28:13-30:85
|
||||
141 android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar"
|
||||
141-->[com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:29:17-115
|
||||
142 android:value="com.google.firebase.components.ComponentRegistrar" />
|
||||
142-->[com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:30:17-82
|
||||
143 <meta-data
|
||||
143-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:32:13-34:85
|
||||
144 android:name="com.google.firebase.components:com.google.firebase.iid.Registrar"
|
||||
144-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:33:17-96
|
||||
145 android:value="com.google.firebase.components.ComponentRegistrar" />
|
||||
145-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:34:17-82
|
||||
146 <meta-data
|
||||
146-->[com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:17:13-19:85
|
||||
147 android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar"
|
||||
147-->[com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:18:17-127
|
||||
148 android:value="com.google.firebase.components.ComponentRegistrar" />
|
||||
148-->[com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:19:17-82
|
||||
149 </service>
|
||||
150
|
||||
151 <receiver
|
||||
151-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:37:9-44:20
|
||||
152 android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
|
||||
152-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:38:13-78
|
||||
153 android:exported="true"
|
||||
153-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:39:13-36
|
||||
154 android:permission="com.google.android.c2dm.permission.SEND" >
|
||||
154-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:40:13-73
|
||||
155 <intent-filter>
|
||||
155-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:41:13-43:29
|
||||
156 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
|
||||
156-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:42:17-81
|
||||
156-->[com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:42:25-78
|
||||
157 </intent-filter>
|
||||
158 </receiver>
|
||||
159
|
||||
160 <provider
|
||||
160-->[com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:26:9-30:39
|
||||
161 android:name="com.google.firebase.provider.FirebaseInitProvider"
|
||||
161-->[com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:27:13-77
|
||||
162 android:authorities="com.gpr.gabinetedigital.firebaseinitprovider"
|
||||
162-->[com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:28:13-72
|
||||
163 android:exported="false"
|
||||
163-->[com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:29:13-37
|
||||
164 android:initOrder="100" />
|
||||
164-->[com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:30:13-36
|
||||
165
|
||||
166 <activity
|
||||
166-->[com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:23:9-26:75
|
||||
167 android:name="com.google.android.gms.common.api.GoogleApiActivity"
|
||||
167-->[com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:24:13-79
|
||||
168 android:exported="false"
|
||||
168-->[com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:25:13-37
|
||||
169 android:theme="@android:style/Theme.Translucent.NoTitleBar" />
|
||||
169-->[com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:26:13-72
|
||||
170
|
||||
171 <meta-data
|
||||
171-->[com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:23:9-25:69
|
||||
172 android:name="com.google.android.gms.version"
|
||||
172-->[com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:24:13-58
|
||||
173 android:value="@integer/google_play_services_version" />
|
||||
173-->[com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:25:13-66
|
||||
174
|
||||
175 <service
|
||||
175-->[com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:29:9-35:19
|
||||
176 android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery"
|
||||
176-->[com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:30:13-103
|
||||
177 android:exported="false" >
|
||||
177-->[com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:31:13-37
|
||||
178 <meta-data
|
||||
178-->[com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:32:13-34:39
|
||||
179 android:name="backend:com.google.android.datatransport.cct.CctBackendFactory"
|
||||
179-->[com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:33:17-94
|
||||
180 android:value="cct" />
|
||||
180-->[com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:34:17-36
|
||||
181 </service>
|
||||
182 <service
|
||||
182-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:26:9-30:19
|
||||
183 android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService"
|
||||
183-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:27:13-117
|
||||
184 android:exported="false"
|
||||
184-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:28:13-37
|
||||
185 android:permission="android.permission.BIND_JOB_SERVICE" >
|
||||
185-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:29:13-69
|
||||
186 </service>
|
||||
187
|
||||
188 <receiver
|
||||
188-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:32:9-34:40
|
||||
189 android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"
|
||||
189-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:33:13-132
|
||||
190 android:exported="false" />
|
||||
190-->[com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:34:13-37
|
||||
191 </application>
|
||||
192
|
||||
193</manifest>
|
||||
=======
|
||||
77-->C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:41:17-51
|
||||
78 </provider>
|
||||
79
|
||||
@@ -343,3 +597,4 @@
|
||||
188 </application>
|
||||
189
|
||||
190</manifest>
|
||||
>>>>>>> developer
|
||||
|
||||
+26
-3
@@ -271,6 +271,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _angular_common__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @angular/common */ "./node_modules/@angular/common/__ivy_ngcc__/fesm2015/common.js");
|
||||
/* harmony import */ var _services_processes_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../services/processes.service */ "./src/app/services/processes.service.ts");
|
||||
/* harmony import */ var _capacitor_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @capacitor/core */ "./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
/* harmony import */ var _angular_router__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @angular/router */ "./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -279,9 +281,10 @@ __webpack_require__.r(__webpack_exports__);
|
||||
|
||||
const { PushNotifications } = _capacitor_core__WEBPACK_IMPORTED_MODULE_5__["Plugins"];
|
||||
let HomePage = class HomePage {
|
||||
constructor(eventService, processesbackend) {
|
||||
constructor(eventService, processesbackend, router) {
|
||||
this.eventService = eventService;
|
||||
this.processesbackend = processesbackend;
|
||||
this.router = router;
|
||||
this.totalEvent = 0;
|
||||
this.totalExpediente = 0;
|
||||
}
|
||||
@@ -303,6 +306,23 @@ let HomePage = class HomePage {
|
||||
this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
|
||||
this.totalExpediente = result;
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
/*
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
alert('Push registration success, token: ' + token.value);
|
||||
console.log('FIREBASE: ', token.value)
|
||||
this.storageService.store(this.username,token.value);
|
||||
},
|
||||
);
|
||||
|
||||
console.log(this.storageService.get(this.username)) */
|
||||
=======
|
||||
PushNotifications.requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
@@ -310,6 +330,7 @@ let HomePage = class HomePage {
|
||||
/* alert('Push registration success, token: ' + token.value); */
|
||||
console.log('FIREBASE: ', token.value);
|
||||
});
|
||||
>>>>>>> developer
|
||||
PushNotifications.addListener('registrationError', (error) => {
|
||||
alert('Error on registration: ' + JSON.stringify(error));
|
||||
});
|
||||
@@ -317,13 +338,15 @@ let HomePage = class HomePage {
|
||||
alert('Push received: ' + JSON.stringify(notification));
|
||||
});
|
||||
PushNotifications.addListener('pushNotificationActionPerformed', (notification) => {
|
||||
alert('Push action performed: ' + JSON.stringify(notification));
|
||||
alert('Push action performed: ' + JSON.stringify(notification.notification.data));
|
||||
this.router.navigate(['/home/events']);
|
||||
});
|
||||
}
|
||||
};
|
||||
HomePage.ctorParameters = () => [
|
||||
{ type: _services_events_service__WEBPACK_IMPORTED_MODULE_2__["EventsService"] },
|
||||
{ type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"] }
|
||||
{ type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"] },
|
||||
{ type: _angular_router__WEBPACK_IMPORTED_MODULE_6__["Router"] }
|
||||
];
|
||||
HomePage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["Component"])({
|
||||
|
||||
+5
-1
File diff suppressed because one or more lines are too long
+32
-2
@@ -483,15 +483,22 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
var _capacitor_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
||||
/*! @capacitor/core */
|
||||
"./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _angular_router__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(
|
||||
/*! @angular/router */
|
||||
"./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
|
||||
var PushNotifications = _capacitor_core__WEBPACK_IMPORTED_MODULE_5__["Plugins"].PushNotifications;
|
||||
|
||||
var HomePage = /*#__PURE__*/function () {
|
||||
function HomePage(eventService, processesbackend) {
|
||||
function HomePage(eventService, processesbackend, router) {
|
||||
_classCallCheck(this, HomePage);
|
||||
|
||||
this.eventService = eventService;
|
||||
this.processesbackend = processesbackend;
|
||||
this.router = router;
|
||||
this.totalEvent = 0;
|
||||
this.totalExpediente = 0;
|
||||
}
|
||||
@@ -519,6 +526,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.processesbackend.GetTasksList("Expediente", true).subscribe(function (result) {
|
||||
_this.totalExpediente = result;
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
/*
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
alert('Push registration success, token: ' + token.value);
|
||||
console.log('FIREBASE: ', token.value)
|
||||
this.storageService.store(this.username,token.value);
|
||||
},
|
||||
);
|
||||
|
||||
console.log(this.storageService.get(this.username)) */
|
||||
|
||||
=======
|
||||
PushNotifications.requestPermission().then(function (result) {
|
||||
PushNotifications.register();
|
||||
});
|
||||
@@ -526,6 +551,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
/* alert('Push registration success, token: ' + token.value); */
|
||||
console.log('FIREBASE: ', token.value);
|
||||
});
|
||||
>>>>>>> developer
|
||||
PushNotifications.addListener('registrationError', function (error) {
|
||||
alert('Error on registration: ' + JSON.stringify(error));
|
||||
});
|
||||
@@ -533,7 +559,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
alert('Push received: ' + JSON.stringify(notification));
|
||||
});
|
||||
PushNotifications.addListener('pushNotificationActionPerformed', function (notification) {
|
||||
alert('Push action performed: ' + JSON.stringify(notification));
|
||||
alert('Push action performed: ' + JSON.stringify(notification.notification.data));
|
||||
|
||||
_this.router.navigate(['/home/events']);
|
||||
});
|
||||
}
|
||||
}]);
|
||||
@@ -546,6 +574,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
type: _services_events_service__WEBPACK_IMPORTED_MODULE_2__["EventsService"]
|
||||
}, {
|
||||
type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"]
|
||||
}, {
|
||||
type: _angular_router__WEBPACK_IMPORTED_MODULE_6__["Router"]
|
||||
}];
|
||||
};
|
||||
|
||||
|
||||
+5
-1
File diff suppressed because one or more lines are too long
+47
@@ -124,9 +124,14 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var src_environments_environment__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/environments/environment */ "./src/environments/environment.ts");
|
||||
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
||||
/* harmony import */ var src_app_services_storage_service__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! src/app/services/storage.service */ "./src/app/services/storage.service.ts");
|
||||
<<<<<<< HEAD
|
||||
/* harmony import */ var src_app_services_photo_service__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/services/photo.service */ "./src/app/services/photo.service.ts");
|
||||
/* harmony import */ var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @capacitor/core */ "./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
=======
|
||||
/* harmony import */ var src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/config/auth-constants */ "./src/app/config/auth-constants.ts");
|
||||
/* harmony import */ var src_app_services_photo_service__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! src/app/services/photo.service */ "./src/app/services/photo.service.ts");
|
||||
|
||||
>>>>>>> developer
|
||||
|
||||
|
||||
|
||||
@@ -136,6 +141,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
|
||||
|
||||
|
||||
|
||||
const { PushNotifications } = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"];
|
||||
let LoginPage = class LoginPage {
|
||||
constructor(router, authService, storageService, toastService, photoService, alertController) {
|
||||
this.router = router;
|
||||
@@ -165,6 +172,45 @@ let LoginPage = class LoginPage {
|
||||
yield alert.present();
|
||||
});
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
/* loginRocketChat(){
|
||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||
console.log('Login to Rocket chat OK');
|
||||
},(error:any) =>{
|
||||
console.log('Network error');
|
||||
});
|
||||
} */
|
||||
storeUserIdANdToken() {
|
||||
PushNotifications.requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
PushNotifications.addListener('registration', (token) => {
|
||||
console.log('FIREBASE TOKEN', token.value);
|
||||
this.storageService.store(this.username, token.value);
|
||||
this.storageService.get(this.username).then(value => {
|
||||
console.log('STORAGE TOKEN', value);
|
||||
});
|
||||
});
|
||||
}
|
||||
;
|
||||
Login() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
/* try { */
|
||||
//Go to our home in home/feed.
|
||||
//this.router.navigate(['/home/events']);
|
||||
if (this.validateInput()) {
|
||||
this.userattempt = {
|
||||
username: this.username,
|
||||
password: this.password,
|
||||
domainName: src_environments_environment__WEBPACK_IMPORTED_MODULE_5__["environment"].domain,
|
||||
BasicAuthKey: ""
|
||||
};
|
||||
if (yield this.authService.login(this.userattempt)) {
|
||||
/* this.loginRocketChat(); */
|
||||
this.storeUserIdANdToken();
|
||||
this.router.navigate(['/home/events']);
|
||||
=======
|
||||
loginRocketChat(user) {
|
||||
let postData = {
|
||||
"user": user.username,
|
||||
@@ -200,6 +246,7 @@ let LoginPage = class LoginPage {
|
||||
//this.toastService.presentToast('Não foi possível fazer login"');
|
||||
this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.');
|
||||
}
|
||||
>>>>>>> developer
|
||||
}
|
||||
else {
|
||||
//this.toastService.presentToast('Preencha todos campos');
|
||||
|
||||
+5
-1
File diff suppressed because one or more lines are too long
+56
@@ -258,6 +258,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
var src_app_services_photo_service__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
|
||||
/*! src/app/services/photo.service */
|
||||
"./src/app/services/photo.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
|
||||
/*! @capacitor/core */
|
||||
"./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
|
||||
var PushNotifications = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"].PushNotifications;
|
||||
|
||||
var LoginPage = /*#__PURE__*/function () {
|
||||
function LoginPage(router, authService, storageService, toastService, photoService, alertController) {
|
||||
@@ -333,6 +341,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_this.presentAlert('Network error ' + error);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "storeUserIdANdToken",
|
||||
value: function storeUserIdANdToken() {
|
||||
var _this = this;
|
||||
|
||||
PushNotifications.requestPermission().then(function (result) {
|
||||
PushNotifications.register();
|
||||
});
|
||||
PushNotifications.addListener('registration', function (token) {
|
||||
console.log('FIREBASE TOKEN', token.value);
|
||||
|
||||
_this.storageService.store(_this.username, token.value);
|
||||
|
||||
_this.storageService.get(_this.username).then(function (value) {
|
||||
console.log('STORAGE TOKEN', value);
|
||||
});
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "Login",
|
||||
value: function Login() {
|
||||
@@ -344,7 +370,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_context2.prev = 0;
|
||||
|
||||
if (!this.validateInput()) {
|
||||
<<<<<<< HEAD
|
||||
_context2.next = 12;
|
||||
=======
|
||||
_context2.next = 14;
|
||||
>>>>>>> developer
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -359,6 +389,31 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
case 5:
|
||||
if (!_context2.sent) {
|
||||
<<<<<<< HEAD
|
||||
_context2.next = 9;
|
||||
break;
|
||||
}
|
||||
|
||||
/* this.loginRocketChat(); */
|
||||
this.storeUserIdANdToken();
|
||||
this.router.navigate(['/home/events']);
|
||||
_context2.next = 10;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
//this.toastService.presentToast('Não foi possível fazer login"');
|
||||
this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.');
|
||||
|
||||
case 10:
|
||||
_context2.next = 13;
|
||||
break;
|
||||
|
||||
case 12:
|
||||
//this.toastService.presentToast('Preencha todos campos');
|
||||
this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
|
||||
|
||||
case 13:
|
||||
=======
|
||||
_context2.next = 11;
|
||||
break;
|
||||
}
|
||||
@@ -392,6 +447,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. ');
|
||||
|
||||
case 21:
|
||||
>>>>>>> developer
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
|
||||
+5
-1
File diff suppressed because one or more lines are too long
@@ -75,6 +75,9 @@
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths" />
|
||||
<meta-data
|
||||
android:name="com.google.firebase.messaging.default_notification_icon"
|
||||
android:resource="@mipmap/ic_launcher" />
|
||||
</provider>
|
||||
|
||||
<service
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,10 @@
|
||||
-- Merging decision tree log ---
|
||||
provider#androidx.core.content.FileProvider
|
||||
<<<<<<< HEAD
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:34:9-43:20
|
||||
=======
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:34:9-42:20
|
||||
>>>>>>> developer
|
||||
android:grantUriPermissions
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:38:13-47
|
||||
android:authorities
|
||||
@@ -11,6 +15,75 @@ INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src
|
||||
android:name
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:35:13-62
|
||||
manifest
|
||||
<<<<<<< HEAD
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-50:12
|
||||
MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.appcompat:appcompat:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\396e7ddea1addefd32f4f3d87ec48909\appcompat-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-27:12
|
||||
MERGED from [androidx.legacy:legacy-support-v4:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\aab5293454cabe85272e9de04d494d57\legacy-support-v4-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\226817fd352d0debd037c03d8ec9b5c1\legacy-support-core-ui-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\705071dba30571a9226503cb1f0dac80\cursoradapter-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.viewpager2:viewpager2:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\305c2898fe2457e82c9da2257c2bc0a1\jetified-viewpager2-1.0.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:17:1-44:12
|
||||
MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:2:1-9:12
|
||||
MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:15:1-34:12
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:17:1-47:12
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:2:1-23:12
|
||||
MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:15:1-39:12
|
||||
MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:2:1-10:12
|
||||
MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:17:1-29:12
|
||||
MERGED from [com.google.firebase:firebase-installations-interop:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f83230e685678f09189e9abde1693e34\jetified-firebase-installations-interop-16.0.0\AndroidManifest.xml:15:1-23:12
|
||||
MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:2:1-9:12
|
||||
MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:17:1-25:12
|
||||
MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:2:1-9:12
|
||||
MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:17:1-28:12
|
||||
MERGED from [androidx.fragment:fragment:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e40e3efd5a968ec9847eae2ae9c7d8ac\fragment-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.appcompat:appcompat-resources:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e66da8b5301e9a6b4d099a6eed9ee5b8\jetified-appcompat-resources-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6984223d1aa8f315c8c42812a9db3a3b\drawerlayout-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.browser:browser:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\caa5198f0ae08d91561862daa07e196f\browser-1.2.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.media:media:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\47ce40ad459cbf22b0d81e337967e729\media-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\92ce016465e3a6bb2a1c0eeefed0193e\legacy-support-core-utils-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bd24342c93fd52cb5e9c9c7bb35f50f1\viewpager-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.loader:loader:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\148f2fd794536689e5a7e95e250ac390\loader-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.activity:activity:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\5d880c01bc106322c4b2a83be9757563\jetified-activity-1.0.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\7369d370d1c3f03944cff7adb4eeb0ab\vectordrawable-animated-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\57d4ae6adbb5ccfa9dafa8ad36f43ff8\vectordrawable-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8c1aed4303e761aac5e34d2036bbfc96\coordinatorlayout-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4ee2c6fbb04620a960d68455ede34459\slidingpanelayout-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.recyclerview:recyclerview:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8d8a8abf56b0acf243894e5c793a7480\recyclerview-1.1.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.customview:customview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2be247bf8cbe2dd724b705391ddac84d\customview-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.transition:transition:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a444f209b7c59a0fec306c6e0a516b3f\transition-1.2.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\db6ea2a636bcb3ab9eb7b581c5db983e\swiperefreshlayout-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ccd497c0d55509e00fa2c4ec5a0ae967\asynclayoutinflater-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:17:1-26:12
|
||||
MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf3e5eb0de5dbaf7174c5a9a34f69c5a\localbroadcastmanager-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.exifinterface:exifinterface:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a5f8c4bd9c5151a79f218b639b5c253f\exifinterface-1.2.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:17:1-27:12
|
||||
MERGED from [androidx.cardview:cardview:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\adb371d4d53f86eab98a28717d70cc7e\cardview-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6435850e23f2d01013861f1c8dbdb3a0\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:15:1-38:12
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:15:1-41:12
|
||||
MERGED from [com.google.firebase:firebase-components:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\626cd0cdd86577b53b05b9ceb0f9a7ca\jetified-firebase-components-16.0.0\AndroidManifest.xml:15:1-23:12
|
||||
MERGED from [com.google.firebase:firebase-encoders-json:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\fe101a7202e82c550c20fc0bfa50e08f\jetified-firebase-encoders-json-16.0.0\AndroidManifest.xml:15:1-23:12
|
||||
MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6ca55331635d9ca1071738b385928a75\documentfile-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.print:print:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5fd7fbc692311a845217063332ce16c\print-1.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.lifecycle:lifecycle-runtime:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\6750b43e205c4f520c814d38be8b2dbe\lifecycle-runtime-2.1.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4585a9ad75e82c7c92523d92d109b415\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.savedstate:savedstate:1.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d831d74eee9f185c588b244b4025c98f\jetified-savedstate-1.0.0\AndroidManifest.xml:17:1-24:12
|
||||
MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f15487c13029c5c78640eedfe3e4179f\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b77454809810e03ad1b0b8586694d509\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\59b723f090061559cc5b6f12f2aff3bc\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12
|
||||
MERGED from [org.apache.cordova:framework:7.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\158881081e6477a246826c6bde171b96\jetified-framework-7.0.0\AndroidManifest.xml:20:1-27:12
|
||||
MERGED from [com.google.android.datatransport:transport-api:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\467b040972e5d42442f90b49207efc7f\jetified-transport-api-2.2.0\AndroidManifest.xml:15:1-22:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
=======
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
@@ -78,11 +151,21 @@ MERGED from [com.google.android.datatransport:transport-api:2.2.0] C:\Users\tiag
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
>>>>>>> developer
|
||||
package
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:3:5-38
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
android:versionName
|
||||
<<<<<<< HEAD
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-64:12
|
||||
INJECTED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
=======
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
@@ -90,9 +173,53 @@ INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:1-63:12
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
>>>>>>> developer
|
||||
xmlns:android
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:2:11-69
|
||||
application
|
||||
<<<<<<< HEAD
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-44:19
|
||||
MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-48:19
|
||||
MERGED from [:capacitor-android] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-48:19
|
||||
MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:22:5-20
|
||||
MERGED from [com.google.android.material:material:1.1.0-rc02] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\19593d9c2c700c52ad03572ebfd537d5\material-1.1.0-rc02\AndroidManifest.xml:22:5-20
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-25:19
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-25:19
|
||||
MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:22:5-42:19
|
||||
MERGED from [com.google.firebase:firebase-messaging:20.1.2] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec0d34db7bfab328a67bc775742a1d9e\jetified-firebase-messaging-20.1.2\AndroidManifest.xml:22:5-42:19
|
||||
MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:7:5-20
|
||||
MERGED from [com.google.android.gms:play-services-location:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\bf701184cb284afcaa68a6fadbfff89e\jetified-play-services-location-17.0.0\AndroidManifest.xml:7:5-20
|
||||
MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:24:5-32:19
|
||||
MERGED from [com.google.firebase:firebase-datatransport:17.0.3] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\ec6ed60bc769c1397d2bb4044e417511\jetified-firebase-datatransport-17.0.3\AndroidManifest.xml:24:5-32:19
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:28:5-45:19
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:28:5-45:19
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:13:5-21:19
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:13:5-21:19
|
||||
MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:25:5-37:19
|
||||
MERGED from [com.google.firebase:firebase-common:19.3.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\d5ae2f905dca277d72c2333071856016\jetified-firebase-common-19.3.0\AndroidManifest.xml:25:5-37:19
|
||||
MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:7:5-8:19
|
||||
MERGED from [com.google.firebase:firebase-iid-interop:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\33cfeb201180ccbffcbd0bf570ba86e2\jetified-firebase-iid-interop-17.0.0\AndroidManifest.xml:7:5-8:19
|
||||
MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:22:5-27:19
|
||||
MERGED from [com.google.android.gms:play-services-base:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\9d9f5eefb5bcc469207d44112eb03d4a\jetified-play-services-base-17.0.0\AndroidManifest.xml:22:5-27:19
|
||||
MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:7:5-20
|
||||
MERGED from [com.google.android.gms:play-services-tasks:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\61b6250f2312bb6eaf48524efa92324f\jetified-play-services-tasks-17.0.0\AndroidManifest.xml:7:5-20
|
||||
MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:22:5-23:19
|
||||
MERGED from [com.google.firebase:firebase-measurement-connector:18.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\eb1940bc3fb957fd232db9f27e4df6ed\jetified-firebase-measurement-connector-18.0.0\AndroidManifest.xml:22:5-23:19
|
||||
MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:22:5-20
|
||||
MERGED from [com.google.android.gms:play-services-places-placereport:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\4a929dd5da9b3523b8f1ddfe5205ecb7\jetified-play-services-places-placereport-17.0.0\AndroidManifest.xml:22:5-20
|
||||
MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:7:5-20
|
||||
MERGED from [com.google.android.gms:play-services-stats:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\b4cf759fbefe631836a911785c931842\jetified-play-services-stats-17.0.0\AndroidManifest.xml:7:5-20
|
||||
MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:22:5-26:19
|
||||
MERGED from [com.google.android.gms:play-services-basement:17.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\f258e3825c6af3b14c7ec1616fae4742\jetified-play-services-basement-17.0.0\AndroidManifest.xml:22:5-26:19
|
||||
MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:5-89
|
||||
MERGED from [androidx.core:core:1.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:5-89
|
||||
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:24:5-25:19
|
||||
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\324b5866ad2c13339651997b434b41f3\versionedparcelable-1.1.0\AndroidManifest.xml:24:5-25:19
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:28:5-36:19
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:28:5-36:19
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
|
||||
=======
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:5:5-43:19
|
||||
MERGED from [:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-48:19
|
||||
MERGED from [:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-48:19
|
||||
@@ -134,6 +261,7 @@ MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Us
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:28:5-36:19
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:25:5-39:19
|
||||
>>>>>>> developer
|
||||
android:appComponentFactory
|
||||
ADDED from [androidx.core:core:1.2.0] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\e5357b0b880d2be0ed83398576c19d42\core-1.2.0\AndroidManifest.xml:24:18-86
|
||||
android:supportsRtl
|
||||
@@ -189,6 +317,65 @@ ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\ma
|
||||
android:scheme
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:29:23-65
|
||||
uses-permission#android.permission.INTERNET
|
||||
<<<<<<< HEAD
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:5-67
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:23:5-67
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:23:5-67
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:11:5-67
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:11:5-67
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:26:5-67
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:26:5-67
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:48:22-64
|
||||
uses-permission#android.permission.READ_EXTERNAL_STORAGE
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:5-79
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:5-80
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:13:5-80
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:50:22-77
|
||||
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:5-81
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:5-81
|
||||
MERGED from [:capacitor-cordova-android-plugins] C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\capacitor-cordova-android-plugins\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:5-81
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:51:22-78
|
||||
uses-permission#android.permission.ACCESS_COARSE_LOCATION
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:5-81
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:53:22-78
|
||||
uses-permission#android.permission.ACCESS_FINE_LOCATION
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:5-79
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:54:22-76
|
||||
uses-feature#android.hardware.location.gps
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:5-66
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:55:19-63
|
||||
uses-permission#android.permission.ACCESS_NETWORK_STATE
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:5-79
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:22:5-79
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:22:5-79
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:10:5-79
|
||||
MERGED from [com.google.firebase:firebase-installations:16.0.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\a9f39591fd7e3606aa03e1dd4d0c2ad4\jetified-firebase-installations-16.0.0\AndroidManifest.xml:10:5-79
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:25:5-79
|
||||
MERGED from [com.google.android.datatransport:transport-backend-cct:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\8e8493fc4060d1a9e60e0e8b89d28daa\jetified-transport-backend-cct-2.2.0\AndroidManifest.xml:25:5-79
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:22:5-79
|
||||
MERGED from [com.google.android.datatransport:transport-runtime:2.2.0] C:\Users\eudes.inacio\.gradle\caches\transforms-2\files-2.1\09a4bf673ec4891d08a21c203c688e10\jetified-transport-runtime-2.2.0\AndroidManifest.xml:22:5-79
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:57:22-76
|
||||
uses-permission#android.permission.CAMERA
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:5-65
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:60:22-62
|
||||
uses-permission#android.permission.RECORD_AUDIO
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:5-71
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:22-68
|
||||
uses-permission#android.permission.MODIFY_AUDIO_SETTINGS
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:5-79
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:63:22-77
|
||||
=======
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:47:5-67
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:23:5-67
|
||||
MERGED from [com.google.firebase:firebase-iid:20.1.1] C:\Users\tiago.kayaya\.gradle\caches\transforms-2\files-2.1\2af03360c2f1d9c4749c1d75a7057ee7\jetified-firebase-iid-20.1.1\AndroidManifest.xml:23:5-67
|
||||
@@ -246,6 +433,7 @@ uses-permission#android.permission.MODIFY_AUDIO_SETTINGS
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:5-79
|
||||
android:name
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:62:22-77
|
||||
>>>>>>> developer
|
||||
uses-sdk
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml
|
||||
@@ -385,7 +573,17 @@ ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\ma
|
||||
android:resource
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:41:17-51
|
||||
android:name
|
||||
<<<<<<< HEAD
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:40:17-67
|
||||
meta-data#com.google.firebase.messaging.default_notification_icon
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:13-136
|
||||
android:resource
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:95-133
|
||||
android:name
|
||||
ADDED from C:\Users\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\app\src\main\AndroidManifest.xml:42:24-94
|
||||
=======
|
||||
ADDED from C:\Users\tiago.kayaya\development\gabinete-digital\android\app\src\main\AndroidManifest.xml:40:17-67
|
||||
>>>>>>> developer
|
||||
uses-feature#android.hardware.camera
|
||||
ADDED from [:capacitor-android] C:\Users\tiago.kayaya\development\gabinete-digital\node_modules\@capacitor\android\capacitor\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-13:36
|
||||
android:required
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths"></meta-data>
|
||||
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@mipmap/ic_launcher" />
|
||||
</provider>
|
||||
</application>
|
||||
|
||||
|
||||
@@ -271,6 +271,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _angular_common__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @angular/common */ "./node_modules/@angular/common/__ivy_ngcc__/fesm2015/common.js");
|
||||
/* harmony import */ var _services_processes_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../services/processes.service */ "./src/app/services/processes.service.ts");
|
||||
/* harmony import */ var _capacitor_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @capacitor/core */ "./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
/* harmony import */ var _angular_router__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @angular/router */ "./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -279,9 +281,10 @@ __webpack_require__.r(__webpack_exports__);
|
||||
|
||||
const { PushNotifications } = _capacitor_core__WEBPACK_IMPORTED_MODULE_5__["Plugins"];
|
||||
let HomePage = class HomePage {
|
||||
constructor(eventService, processesbackend) {
|
||||
constructor(eventService, processesbackend, router) {
|
||||
this.eventService = eventService;
|
||||
this.processesbackend = processesbackend;
|
||||
this.router = router;
|
||||
this.totalEvent = 0;
|
||||
this.totalExpediente = 0;
|
||||
}
|
||||
@@ -303,6 +306,23 @@ let HomePage = class HomePage {
|
||||
this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
|
||||
this.totalExpediente = result;
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
/*
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
alert('Push registration success, token: ' + token.value);
|
||||
console.log('FIREBASE: ', token.value)
|
||||
this.storageService.store(this.username,token.value);
|
||||
},
|
||||
);
|
||||
|
||||
console.log(this.storageService.get(this.username)) */
|
||||
=======
|
||||
PushNotifications.requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
@@ -310,6 +330,7 @@ let HomePage = class HomePage {
|
||||
/* alert('Push registration success, token: ' + token.value); */
|
||||
console.log('FIREBASE: ', token.value);
|
||||
});
|
||||
>>>>>>> developer
|
||||
PushNotifications.addListener('registrationError', (error) => {
|
||||
alert('Error on registration: ' + JSON.stringify(error));
|
||||
});
|
||||
@@ -317,13 +338,15 @@ let HomePage = class HomePage {
|
||||
alert('Push received: ' + JSON.stringify(notification));
|
||||
});
|
||||
PushNotifications.addListener('pushNotificationActionPerformed', (notification) => {
|
||||
alert('Push action performed: ' + JSON.stringify(notification));
|
||||
alert('Push action performed: ' + JSON.stringify(notification.notification.data));
|
||||
this.router.navigate(['/home/events']);
|
||||
});
|
||||
}
|
||||
};
|
||||
HomePage.ctorParameters = () => [
|
||||
{ type: _services_events_service__WEBPACK_IMPORTED_MODULE_2__["EventsService"] },
|
||||
{ type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"] }
|
||||
{ type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"] },
|
||||
{ type: _angular_router__WEBPACK_IMPORTED_MODULE_6__["Router"] }
|
||||
];
|
||||
HomePage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["Component"])({
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -483,15 +483,22 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
var _capacitor_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
||||
/*! @capacitor/core */
|
||||
"./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _angular_router__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(
|
||||
/*! @angular/router */
|
||||
"./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
|
||||
var PushNotifications = _capacitor_core__WEBPACK_IMPORTED_MODULE_5__["Plugins"].PushNotifications;
|
||||
|
||||
var HomePage = /*#__PURE__*/function () {
|
||||
function HomePage(eventService, processesbackend) {
|
||||
function HomePage(eventService, processesbackend, router) {
|
||||
_classCallCheck(this, HomePage);
|
||||
|
||||
this.eventService = eventService;
|
||||
this.processesbackend = processesbackend;
|
||||
this.router = router;
|
||||
this.totalEvent = 0;
|
||||
this.totalExpediente = 0;
|
||||
}
|
||||
@@ -519,6 +526,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.processesbackend.GetTasksList("Expediente", true).subscribe(function (result) {
|
||||
_this.totalExpediente = result;
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
/*
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
alert('Push registration success, token: ' + token.value);
|
||||
console.log('FIREBASE: ', token.value)
|
||||
this.storageService.store(this.username,token.value);
|
||||
},
|
||||
);
|
||||
|
||||
console.log(this.storageService.get(this.username)) */
|
||||
|
||||
=======
|
||||
PushNotifications.requestPermission().then(function (result) {
|
||||
PushNotifications.register();
|
||||
});
|
||||
@@ -526,6 +551,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
/* alert('Push registration success, token: ' + token.value); */
|
||||
console.log('FIREBASE: ', token.value);
|
||||
});
|
||||
>>>>>>> developer
|
||||
PushNotifications.addListener('registrationError', function (error) {
|
||||
alert('Error on registration: ' + JSON.stringify(error));
|
||||
});
|
||||
@@ -533,7 +559,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
alert('Push received: ' + JSON.stringify(notification));
|
||||
});
|
||||
PushNotifications.addListener('pushNotificationActionPerformed', function (notification) {
|
||||
alert('Push action performed: ' + JSON.stringify(notification));
|
||||
alert('Push action performed: ' + JSON.stringify(notification.notification.data));
|
||||
|
||||
_this.router.navigate(['/home/events']);
|
||||
});
|
||||
}
|
||||
}]);
|
||||
@@ -546,6 +574,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
type: _services_events_service__WEBPACK_IMPORTED_MODULE_2__["EventsService"]
|
||||
}, {
|
||||
type: _services_processes_service__WEBPACK_IMPORTED_MODULE_4__["ProcessesService"]
|
||||
}, {
|
||||
type: _angular_router__WEBPACK_IMPORTED_MODULE_6__["Router"]
|
||||
}];
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -124,9 +124,14 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var src_environments_environment__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/environments/environment */ "./src/environments/environment.ts");
|
||||
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
||||
/* harmony import */ var src_app_services_storage_service__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! src/app/services/storage.service */ "./src/app/services/storage.service.ts");
|
||||
<<<<<<< HEAD
|
||||
/* harmony import */ var src_app_services_photo_service__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/services/photo.service */ "./src/app/services/photo.service.ts");
|
||||
/* harmony import */ var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @capacitor/core */ "./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
=======
|
||||
/* harmony import */ var src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/config/auth-constants */ "./src/app/config/auth-constants.ts");
|
||||
/* harmony import */ var src_app_services_photo_service__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! src/app/services/photo.service */ "./src/app/services/photo.service.ts");
|
||||
|
||||
>>>>>>> developer
|
||||
|
||||
|
||||
|
||||
@@ -136,6 +141,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
|
||||
|
||||
|
||||
|
||||
const { PushNotifications } = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"];
|
||||
let LoginPage = class LoginPage {
|
||||
constructor(router, authService, storageService, toastService, photoService, alertController) {
|
||||
this.router = router;
|
||||
@@ -165,6 +172,45 @@ let LoginPage = class LoginPage {
|
||||
yield alert.present();
|
||||
});
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
/* loginRocketChat(){
|
||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||
console.log('Login to Rocket chat OK');
|
||||
},(error:any) =>{
|
||||
console.log('Network error');
|
||||
});
|
||||
} */
|
||||
storeUserIdANdToken() {
|
||||
PushNotifications.requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
PushNotifications.addListener('registration', (token) => {
|
||||
console.log('FIREBASE TOKEN', token.value);
|
||||
this.storageService.store(this.username, token.value);
|
||||
this.storageService.get(this.username).then(value => {
|
||||
console.log('STORAGE TOKEN', value);
|
||||
});
|
||||
});
|
||||
}
|
||||
;
|
||||
Login() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
/* try { */
|
||||
//Go to our home in home/feed.
|
||||
//this.router.navigate(['/home/events']);
|
||||
if (this.validateInput()) {
|
||||
this.userattempt = {
|
||||
username: this.username,
|
||||
password: this.password,
|
||||
domainName: src_environments_environment__WEBPACK_IMPORTED_MODULE_5__["environment"].domain,
|
||||
BasicAuthKey: ""
|
||||
};
|
||||
if (yield this.authService.login(this.userattempt)) {
|
||||
/* this.loginRocketChat(); */
|
||||
this.storeUserIdANdToken();
|
||||
this.router.navigate(['/home/events']);
|
||||
=======
|
||||
loginRocketChat(user) {
|
||||
let postData = {
|
||||
"user": user.username,
|
||||
@@ -200,6 +246,7 @@ let LoginPage = class LoginPage {
|
||||
//this.toastService.presentToast('Não foi possível fazer login"');
|
||||
this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.');
|
||||
}
|
||||
>>>>>>> developer
|
||||
}
|
||||
else {
|
||||
//this.toastService.presentToast('Preencha todos campos');
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -258,6 +258,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
var src_app_services_photo_service__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
|
||||
/*! src/app/services/photo.service */
|
||||
"./src/app/services/photo.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _capacitor_core__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
|
||||
/*! @capacitor/core */
|
||||
"./node_modules/@capacitor/core/dist/esm/index.js");
|
||||
|
||||
var PushNotifications = _capacitor_core__WEBPACK_IMPORTED_MODULE_9__["Plugins"].PushNotifications;
|
||||
|
||||
var LoginPage = /*#__PURE__*/function () {
|
||||
function LoginPage(router, authService, storageService, toastService, photoService, alertController) {
|
||||
@@ -333,6 +341,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_this.presentAlert('Network error ' + error);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "storeUserIdANdToken",
|
||||
value: function storeUserIdANdToken() {
|
||||
var _this = this;
|
||||
|
||||
PushNotifications.requestPermission().then(function (result) {
|
||||
PushNotifications.register();
|
||||
});
|
||||
PushNotifications.addListener('registration', function (token) {
|
||||
console.log('FIREBASE TOKEN', token.value);
|
||||
|
||||
_this.storageService.store(_this.username, token.value);
|
||||
|
||||
_this.storageService.get(_this.username).then(function (value) {
|
||||
console.log('STORAGE TOKEN', value);
|
||||
});
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "Login",
|
||||
value: function Login() {
|
||||
@@ -344,7 +370,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
_context2.prev = 0;
|
||||
|
||||
if (!this.validateInput()) {
|
||||
<<<<<<< HEAD
|
||||
_context2.next = 12;
|
||||
=======
|
||||
_context2.next = 14;
|
||||
>>>>>>> developer
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -359,6 +389,31 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
|
||||
case 5:
|
||||
if (!_context2.sent) {
|
||||
<<<<<<< HEAD
|
||||
_context2.next = 9;
|
||||
break;
|
||||
}
|
||||
|
||||
/* this.loginRocketChat(); */
|
||||
this.storeUserIdANdToken();
|
||||
this.router.navigate(['/home/events']);
|
||||
_context2.next = 10;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
//this.toastService.presentToast('Não foi possível fazer login"');
|
||||
this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.');
|
||||
|
||||
case 10:
|
||||
_context2.next = 13;
|
||||
break;
|
||||
|
||||
case 12:
|
||||
//this.toastService.presentToast('Preencha todos campos');
|
||||
this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
|
||||
|
||||
case 13:
|
||||
=======
|
||||
_context2.next = 11;
|
||||
break;
|
||||
}
|
||||
@@ -392,6 +447,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
||||
this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. ');
|
||||
|
||||
case 21:
|
||||
>>>>>>> developer
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
+152
-28
@@ -3,10 +3,16 @@ import { EventsService } from '../services/events.service';
|
||||
import { formatDate } from '@angular/common';
|
||||
import { Event } from '../models/event.model';
|
||||
import { ProcessesService } from '../services/processes.service';
|
||||
import { StorageService } from 'src/app/services/storage.service';
|
||||
import { ModalController } from '@ionic/angular';
|
||||
import { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';
|
||||
import { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';
|
||||
|
||||
import { Plugins, PushNotification,PushNotificationToken,PushNotificationActionPerformed} from '@capacitor/core';
|
||||
import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { MethodCall } from '@angular/compiler';
|
||||
|
||||
const { PushNotifications } = Plugins;
|
||||
const { PushNotifications, LocalNotifications } = Plugins;
|
||||
|
||||
@Component({
|
||||
selector: 'app-home',
|
||||
@@ -18,61 +24,179 @@ export class HomePage implements OnInit {
|
||||
prEventList: Event[];
|
||||
mdEventList: Event[];
|
||||
|
||||
totalEvent=0;
|
||||
totalExpediente=0;
|
||||
profile:string;
|
||||
totalEvent = 0;
|
||||
totalExpediente = 0;
|
||||
profile: string;
|
||||
|
||||
constructor(private eventService: EventsService, private processesbackend:ProcessesService) { }
|
||||
constructor(private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
|
||||
|
||||
ngOnInit() {
|
||||
//Initialize profile as mdgpr
|
||||
this.profile = "mdgpr";
|
||||
if(this.profile == "mdgpr"){
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.eventsList = res;
|
||||
this.totalEvent = this.eventsList.length;
|
||||
});
|
||||
});
|
||||
}
|
||||
else{
|
||||
else {
|
||||
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.eventsList = res;
|
||||
this.totalEvent = this.eventsList.length;
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
|
||||
this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
|
||||
this.totalExpediente = result;
|
||||
});
|
||||
/*
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
alert('Push registration success, token: ' + token.value);
|
||||
console.log('FIREBASE: ', token.value)
|
||||
this.storageService.store(this.username,token.value);
|
||||
},
|
||||
);
|
||||
|
||||
console.log(this.storageService.get(this.username)) */
|
||||
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
/* alert('Push registration success, token: ' + token.value); */
|
||||
console.log('FIREBASE: ', token.value)
|
||||
},
|
||||
);
|
||||
|
||||
PushNotifications.addListener('registrationError', (error: any) => {
|
||||
alert('Error on registration: ' + JSON.stringify(error));
|
||||
});
|
||||
|
||||
|
||||
PushNotifications.addListener(
|
||||
'pushNotificationReceived',
|
||||
(notification: PushNotification) => {
|
||||
alert('Push received: ' + JSON.stringify(notification));
|
||||
//alert('Push received: ' + JSON.stringify(notification));
|
||||
//this.localNotificationPresent(notification);
|
||||
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
PushNotifications.addListener(
|
||||
'pushNotificationActionPerformed',
|
||||
(notification: PushNotificationActionPerformed) => {
|
||||
alert('Push action performed: ' + JSON.stringify(notification));
|
||||
let service = notification.notification.data.service;
|
||||
|
||||
let object = notification.notification.data.object;
|
||||
let idObject = notification.notification.data.idObject;
|
||||
let folder = notification.notification.data.folder;
|
||||
let publicationId = notification.notification.data.publicationId;
|
||||
let processId = notification.notification.data.processId;
|
||||
|
||||
console.log('FOLDER PROCESS', folder.ProcessId)
|
||||
|
||||
if (service != null) {
|
||||
|
||||
if (service === "events") {
|
||||
this.router.navigate(['/home/', service, idObject, 'home']);
|
||||
} else if (service === "agenda") {
|
||||
this.router.navigate(['/home/', service, idObject, 'home']);
|
||||
} else if (service === "gabinete-digital") {
|
||||
this.router.navigate(['/home/', service]);
|
||||
} else if (service === "gabinete-digital-expediente") {
|
||||
this.router.navigate(['/home/gabinete-digital/', object, idObject]);
|
||||
}
|
||||
} else {
|
||||
|
||||
if (processId || publicationId != null) {
|
||||
this.viewPublicationDetail(processId, publicationId)
|
||||
}
|
||||
|
||||
if (notification.notification.data.folder.ProcessId != null) {
|
||||
this.viewPublications(folder)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*switch (service) {
|
||||
case "events":
|
||||
this.router.navigate(['/home/', service, idObject, 'home']);
|
||||
break;
|
||||
case "agenda":
|
||||
this.router.navigate(['/home/', service, idObject, 'home']);
|
||||
break;
|
||||
case "gabinete-digital":
|
||||
this.router.navigate(['/home/', service]);
|
||||
break;
|
||||
case "gabinete-digital-expediente":
|
||||
this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);
|
||||
break;
|
||||
case "": {
|
||||
|
||||
if(publicationId && processId != null) {
|
||||
this.viewPublicationDetail(publicationId,processId)
|
||||
}
|
||||
if (folder.ProcessId != null) {
|
||||
this.viewPublications(folder)
|
||||
}
|
||||
}
|
||||
|
||||
default:
|
||||
this.router.navigate(['/home/']);
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
async localNotificationPresent(notification) {
|
||||
|
||||
LocalNotifications.schedule({
|
||||
notifications: [
|
||||
{
|
||||
title: notification.title,
|
||||
body: notification.body,
|
||||
id: 1,
|
||||
schedule: { at: new Date(Date.now() + 1000) },
|
||||
sound: null,
|
||||
attachments: null,
|
||||
actionTypeId: "",
|
||||
extra: null
|
||||
}
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
async viewPublicationDetail(processId: string, publicationId: string) {
|
||||
const modal = await this.modalController.create({
|
||||
component: PublicationDetailPage,
|
||||
componentProps: {
|
||||
publicationId: publicationId,
|
||||
folderId: processId,
|
||||
},
|
||||
cssClass: 'publication-detail',
|
||||
backdropDismiss: false
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss();
|
||||
}
|
||||
|
||||
async viewPublications(folder) {
|
||||
|
||||
const modal = await this.modalController.create({
|
||||
component: ViewPublicationsPage,
|
||||
/* enterAnimation,
|
||||
leaveAnimation, */
|
||||
componentProps: {
|
||||
item: folder,
|
||||
},
|
||||
cssClass: 'new-action',
|
||||
backdropDismiss: false
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
export class Token {
|
||||
UserId: number;
|
||||
TokenId: string;
|
||||
Status: number;
|
||||
Service: number
|
||||
}
|
||||
@@ -8,6 +8,14 @@ import { AlertController } from '@ionic/angular';
|
||||
import { StorageService } from 'src/app/services/storage.service';
|
||||
import { AuthConnstants } from 'src/app/config/auth-constants';
|
||||
import { PhotoService } from 'src/app/services/photo.service';
|
||||
import { NotificationsService } from 'src/app/services/notifications.service';
|
||||
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
|
||||
import { Token } from '../../models/token.model';
|
||||
|
||||
import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
|
||||
|
||||
const { PushNotifications } = Plugins;
|
||||
|
||||
|
||||
|
||||
@Component({
|
||||
@@ -23,7 +31,9 @@ export class LoginPage implements OnInit {
|
||||
userattempt: User;
|
||||
|
||||
constructor(
|
||||
private router: Router,
|
||||
private http: HttpClient,
|
||||
private notificatinsservice: NotificationsService,
|
||||
private router: Router,
|
||||
private authService: AuthService,
|
||||
private storageService: StorageService,
|
||||
private toastService: ToastService,
|
||||
@@ -31,17 +41,17 @@ export class LoginPage implements OnInit {
|
||||
public alertController: AlertController) { }
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
|
||||
}
|
||||
//Function to validade the login inputs
|
||||
validateInput(){
|
||||
validateInput() {
|
||||
return (
|
||||
this.username.trim().length > 0
|
||||
this.username.trim().length > 0
|
||||
&& this.password.trim().length > 0
|
||||
);
|
||||
);
|
||||
}
|
||||
|
||||
async presentAlert(message:string) {
|
||||
async presentAlert(message: string) {
|
||||
const alert = await this.alertController.create({
|
||||
cssClass: 'my-custom-class',
|
||||
header: 'Mensagem do sistema',
|
||||
@@ -52,54 +62,89 @@ export class LoginPage implements OnInit {
|
||||
await alert.present();
|
||||
}
|
||||
|
||||
loginRocketChat(user:any){
|
||||
|
||||
loginRocketChat(user: any) {
|
||||
|
||||
let postData = {
|
||||
"user": user.username,
|
||||
"password": user.password,
|
||||
}
|
||||
this.authService.loginChat(postData).subscribe((res: any) =>{
|
||||
this.authService.loginChat(postData).subscribe((res: any) => {
|
||||
console.log(res.data);
|
||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||
console.log('Login to Rocket chat OK');
|
||||
},(error:any) =>{
|
||||
}, (error: any) => {
|
||||
console.log('Network error');
|
||||
this.presentAlert('Network error '+error);
|
||||
this.presentAlert('Network error ' + error);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
async Login(){
|
||||
try {
|
||||
//Go to our home in home/feed.
|
||||
//this.router.navigate(['/home/events']);
|
||||
if(this.validateInput()){
|
||||
this.userattempt = {
|
||||
username: this.username,
|
||||
password: this.password,
|
||||
domainName: environment.domain,
|
||||
BasicAuthKey: ""
|
||||
}
|
||||
if (await this.authService.login(this.userattempt)){
|
||||
console.log(this.userattempt);
|
||||
|
||||
this.loginRocketChat(this.userattempt);
|
||||
this.router.navigate(['/home/events']);
|
||||
}
|
||||
else
|
||||
{
|
||||
//this.toastService.presentToast('Não foi possível fazer login"');
|
||||
this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.');
|
||||
}
|
||||
storeUserIdANdToken() {
|
||||
|
||||
(PushNotifications as any).requestPermission().then(result => {
|
||||
PushNotifications.register();
|
||||
});
|
||||
|
||||
PushNotifications.addListener(
|
||||
'registration',
|
||||
(token: PushNotificationToken) => {
|
||||
console.log('FIREBASE TOKEN', token.value)
|
||||
this.storageService.store(this.username, token.value);
|
||||
this.storageService.get(this.username).then(value => {
|
||||
console.log('STORAGE TOKEN', value)
|
||||
this.storageService.get(AuthConnstants.USER).then(res => {
|
||||
console.log('USERID', res);
|
||||
const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
|
||||
const body = { UserId: res,
|
||||
TokenId: token.value,
|
||||
Status: 1,
|
||||
Service: 1 };
|
||||
|
||||
this.http.post<Token>('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body,{headers}).subscribe(data => {
|
||||
console.log('TOKEN USER MIDLE', data);
|
||||
})
|
||||
/*this.http.get<Token>('http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/notifications/user/'+res).subscribe(data => {
|
||||
console.log('TOKEN USER MIDLE',data);
|
||||
})*/
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
},
|
||||
);
|
||||
|
||||
};
|
||||
|
||||
|
||||
async Login() {
|
||||
/* try { */
|
||||
//Go to our home in home/feed.
|
||||
//this.router.navigate(['/home/events']);
|
||||
if (this.validateInput()) {
|
||||
this.userattempt = {
|
||||
username: this.username,
|
||||
password: this.password,
|
||||
domainName: environment.domain,
|
||||
BasicAuthKey: ""
|
||||
}
|
||||
if (await this.authService.login(this.userattempt)) {
|
||||
/* this.loginRocketChat(); */
|
||||
this.storeUserIdANdToken()
|
||||
|
||||
this.router.navigate(['/home/events']);
|
||||
}
|
||||
else {
|
||||
//this.toastService.presentToast('Não foi possível fazer login"');
|
||||
this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.');
|
||||
}
|
||||
else{
|
||||
//this.toastService.presentToast('Preencha todos campos');
|
||||
this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
|
||||
}
|
||||
} catch (error) {
|
||||
error
|
||||
this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. ');
|
||||
}
|
||||
else {
|
||||
//this.toastService.presentToast('Preencha todos campos');
|
||||
this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
|
||||
}
|
||||
/* } catch (error) {
|
||||
error
|
||||
this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '+ error);
|
||||
} */
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
|
||||
import { NotificationsService } from './notifications.service';
|
||||
|
||||
describe('NotificationsService', () => {
|
||||
let service: NotificationsService;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({});
|
||||
service = TestBed.inject(NotificationsService);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(service).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,30 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { Token } from '../models/token.model';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class NotificationsService {
|
||||
|
||||
constructor(private http: HttpClient,) { }
|
||||
|
||||
getTokenByUserIdAndId(user, userID) {
|
||||
const geturl = environment.apiURL + 'notifications/user/' + userID;
|
||||
|
||||
return this.http.get<Token[]>(`${geturl}`);
|
||||
}
|
||||
|
||||
postToken(userId, token) {
|
||||
const geturl = environment.apiURL + 'notifications/token';
|
||||
|
||||
let data = {
|
||||
UserId: userId,
|
||||
TokenId: token,
|
||||
Status: 1,
|
||||
Service: 2
|
||||
}
|
||||
return this.http.post<Token[]>(`${geturl}`,data);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user