Merge pull request #1594 from minvws/remove-camera-permission

Remove camera permission
minvws · Jul 31, 2023 · 0e76917 · 0e76917
2 parents 975a9a3 + 8108816
commit 0e76917
Show file tree

Hide file tree

Showing 41 changed files with 10 additions and 2,380 deletions.
diff --git a/holder/build.gradle b/holder/build.gradle
@@ -180,7 +180,6 @@ dependencies {
     implementation project(":introduction")
     implementation project(":api")
     implementation project(':mobilecore')
-    implementation project(":qrscanner")
     implementation project(":modules:luhncheck")
     implementation project(":modules:qrgenerator")
     implementation project(":modules:openidconnect")

diff --git a/holder/src/main/AndroidManifest.xml b/holder/src/main/AndroidManifest.xml
@@ -3,11 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA"  />
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
 
     <application
         android:name=".HolderApplication"

diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderApplication.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderApplication.kt
@@ -33,7 +33,6 @@ import nl.rijksoverheid.ctr.introduction.introductionModule
 import nl.rijksoverheid.ctr.persistence.database.HolderDatabase
 import nl.rijksoverheid.ctr.persistence.database.entities.WalletEntity
 import nl.rijksoverheid.ctr.persistence.database.usecases.RemoveCTBUseCase
-import nl.rijksoverheid.ctr.qrscanner.qrScannerModule
 import nl.rijksoverheid.ctr.shared.MobileCoreWrapper
 import nl.rijksoverheid.ctr.shared.SharedApplication
 import nl.rijksoverheid.ctr.shared.sharedModule
@@ -77,7 +76,6 @@ open class HolderApplication : SharedApplication(), Configuration.Provider {
         errorsModule(BuildConfig.FLAVOR),
         retrofitModule(BuildConfig.BASE_API_URL, BuildConfig.CDN_API_URL),
         responsesModule,
-        qrScannerModule,
         fuzzyMatchingModule,
         dashboardModule
     ).toTypedArray()

diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainFragment.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainFragment.kt
@@ -63,11 +63,6 @@ class HolderMainFragment : Fragment(R.layout.fragment_main) {
                     requireActivity().onBackPressedDispatcher.onBackPressed()
                     return@setNavigationOnClickListener
                 }
-                R.id.nav_data_migration_instructions -> {
-                    // Trigger custom dispatcher in destination
-                    requireActivity().onBackPressedDispatcher.onBackPressed()
-                    return@setNavigationOnClickListener
-                }
             }
 
             NavigationUI.navigateUp(navController, null)

diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/data_migration/DataExportUseCase.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/data_migration/DataExportUseCase.kt
diff --git a/...er/src/main/java/nl/rijksoverheid/ctr/holder/data_migration/DataMigrationImportUseCase.kt b/...er/src/main/java/nl/rijksoverheid/ctr/holder/data_migration/DataMigrationImportUseCase.kt
diff --git a/...main/java/nl/rijksoverheid/ctr/holder/data_migration/DataMigrationInstructionsFragment.kt b/...main/java/nl/rijksoverheid/ctr/holder/data_migration/DataMigrationInstructionsFragment.kt