Merge pull request #195 from leonlatsch/release/1.4.2

Release: 1.4.2
leonlatsch · Oct 8, 2022 · 93d895f · 93d895f
2 parents f4d3831 + c2c0826
commit 93d895f
Show file tree

Hide file tree

Showing 14 changed files with 351 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ Also available at **[IzzyOnDroid (F-Droid)](https://apt.izzysoft.de/fdroid/index
 ![English](https://img.shields.io/badge/English-100%25-brightgreen)
 ![Chinese (China)](https://img.shields.io/badge/Chinese%20(China)-100%25-brightgreen)
 ![Dutch](https://img.shields.io/badge/Dutch-97%25-yellow)
+![French](https://img.shields.io/badge/French-100%25-brightgreen)
 ![German](https://img.shields.io/badge/German-100%25-brightgreen)
 ![Portuguese (Brazil)](https://img.shields.io/badge/Portuguese%20(Brazil)-97%25-yellow)
 ![Spanish](https://img.shields.io/badge/Spanish-97%25-yellow)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,8 @@
     package="dev.leonlatsch.photok">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28"

diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
@@ -34,5 +34,11 @@
     "name": "Luke Jake",
     "contact": "@comparesheriff on Github",
     "website": "https://github.com/comparesheriff"
+  },
+  {
+    "contribution": "French translation and reporting bugs",
+    "name": "Arnaud Gissinger",
+    "contact": "agissing@student.42.fr",
+    "website": "https://mathix.ninja"
   }
 ]
diff --git a/app/src/main/assets/open_source_licenses.json b/app/src/main/assets/open_source_licenses.json
@@ -1927,6 +1927,23 @@
     ],
     "dependency": "com.google.android.material:material:1.4.0-beta01"
   },
+  {
+    "project": "MikeOrtiz/TouchImageView",
+    "description": "Adds touch functionality to Android ImageView.",
+    "version": "3.0.1",
+    "developers": [
+      "Michael Ortiz"
+    ],
+    "url": "https://github.com/MikeOrtiz/TouchImageView",
+    "year": "2011",
+    "licenses": [
+      {
+        "license": "MIT License",
+        "license_url": "https://api.github.com/licenses/mit"
+      }
+    ],
+    "dependency": "com.github.MikeOrtiz:TouchImageView:3.0.1"
+  },
   {
     "project": "org.jetbrains.kotlin:kotlin-android-extensions-runtime",
     "description": "Kotlin Android Extensions Runtime",
@@ -2012,16 +2029,6 @@
     ],
     "dependency": "com.jakewharton.timber:timber:4.7.1"
   },
-  {
-    "project": "TouchImageView",
-    "description": null,
-    "version": "3.0.1",
-    "developers": [],
-    "url": null,
-    "year": null,
-    "licenses": [],
-    "dependency": "com.github.MikeOrtiz:TouchImageView:3.0.1"
-  },
   {
     "project": "VersionedParcelable",
     "description": "Provides a stable but relatively compact binary serialization format that can be passed across processes or persisted safely.",

diff --git a/app/src/main/java/dev/leonlatsch/photok/gallery/ui/importing/ImportMenuDialog.kt b/app/src/main/java/dev/leonlatsch/photok/gallery/ui/importing/ImportMenuDialog.kt
@@ -16,7 +16,6 @@
 
 package dev.leonlatsch.photok.gallery.ui.importing
 
-import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
@@ -25,8 +24,9 @@ import dev.leonlatsch.photok.backup.ui.RestoreBackupDialogFragment
 import dev.leonlatsch.photok.databinding.DialogImportMenuBinding
 import dev.leonlatsch.photok.other.REQ_PERM_IMPORT_PHOTOS
 import dev.leonlatsch.photok.other.REQ_PERM_IMPORT_VIDEOS
-import dev.leonlatsch.photok.other.REQ_PERM_RESTORE
 import dev.leonlatsch.photok.other.extensions.show
+import dev.leonlatsch.photok.permissions.getReadImagesPermission
+import dev.leonlatsch.photok.permissions.getReadVideosPermission
 import dev.leonlatsch.photok.uicomponnets.Chooser
 import dev.leonlatsch.photok.uicomponnets.bindings.BindableBottomSheetDialogFragment
 import pub.devrel.easypermissions.AfterPermissionGranted
@@ -53,7 +53,7 @@ class ImportMenuDialog :
         .allowMultiple()
         .requestCode(REQ_CONTENT_PHOTOS)
         .permissionCode(REQ_PERM_IMPORT_PHOTOS)
-        .permission(Manifest.permission.READ_EXTERNAL_STORAGE)
+        .permission(getReadImagesPermission())
         .show(this)
 
     /**
@@ -69,20 +69,17 @@ class ImportMenuDialog :
         .allowMultiple()
         .requestCode(REQ_CONTENT_VIDEOS)
         .permissionCode(REQ_PERM_IMPORT_VIDEOS)
-        .permission(Manifest.permission.READ_EXTERNAL_STORAGE)
+        .permission(getReadVideosPermission())
         .show(this)
 
     /**
      * Start restoring a backup.
      * Requests permission and shows [RestoreBackupDialogFragment].
      */
-    @AfterPermissionGranted(REQ_PERM_RESTORE)
     fun startSelectBackup() = Chooser.Builder()
         .message("Select Backup")
         .mimeType("application/zip")
         .requestCode(REQ_CONTENT_BACKUP)
-        .permissionCode(REQ_PERM_RESTORE)
-        .permission(Manifest.permission.READ_EXTERNAL_STORAGE)
         .show(this)
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

diff --git a/app/src/main/java/dev/leonlatsch/photok/gallery/ui/importing/SharedUrisStore.kt b/app/src/main/java/dev/leonlatsch/photok/gallery/ui/importing/SharedUrisStore.kt
@@ -31,7 +31,5 @@ class SharedUrisStore {
 
     fun getUris(): List<Uri> = sharedUris.toList()
 
-    fun getUriCount(): Int = sharedUris.size
-
     fun clear() = sharedUris.clear()
 }
diff --git a/app/src/main/java/dev/leonlatsch/photok/main/ui/MainActivity.kt b/app/src/main/java/dev/leonlatsch/photok/main/ui/MainActivity.kt
@@ -16,12 +16,12 @@
 
 package dev.leonlatsch.photok.main.ui
 
-import android.Manifest
 import android.content.Intent
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import dev.leonlatsch.photok.ApplicationState
 import dev.leonlatsch.photok.R
@@ -30,9 +30,12 @@ import dev.leonlatsch.photok.gallery.ui.importing.ImportBottomSheetDialogFragmen
 import dev.leonlatsch.photok.other.REQ_PERM_SHARED_IMPORT
 import dev.leonlatsch.photok.other.extensions.getBaseApplication
 import dev.leonlatsch.photok.other.extensions.setNavBarColorRes
+import dev.leonlatsch.photok.permissions.getReadImagesPermission
+import dev.leonlatsch.photok.permissions.getReadVideosPermission
 import dev.leonlatsch.photok.settings.data.Config
 import dev.leonlatsch.photok.uicomponnets.Dialogs
 import dev.leonlatsch.photok.uicomponnets.bindings.BindableActivity
+import kotlinx.coroutines.flow.collectLatest
 import pub.devrel.easypermissions.AfterPermissionGranted
 import pub.devrel.easypermissions.EasyPermissions
 import javax.inject.Inject
@@ -63,15 +66,21 @@ class MainActivity : BindableActivity<ActivityMainBinding>(R.layout.activity_mai
         super.onPostCreate(savedInstanceState)
         dispatchIntent()
 
-        getBaseApplication().rawApplicationState.observe(this) {
-            if (it == ApplicationState.UNLOCKED && viewModel.getUriCountFromStore() > 0) {
-                val urisToImport = viewModel.consumeSharedUris()
-
-                confirmImport(urisToImport) {
-                    startImportOfSharedUris(urisToImport)
+        lifecycleScope.launchWhenCreated {
+            viewModel.consumedUrisFromStore.collectLatest {
+                if (it.isNotEmpty()) {
+                    confirmImport(it.size) {
+                        startImportOfSharedUris()
+                    }
                 }
             }
         }
+
+        getBaseApplication().rawApplicationState.observe(this) {
+            if (it == ApplicationState.UNLOCKED) {
+                viewModel.consumeSharedUris()
+            }
+        }
     }
 
     private fun dispatchIntent() {
@@ -86,12 +95,12 @@ class MainActivity : BindableActivity<ActivityMainBinding>(R.layout.activity_mai
         }
     }
 
-    private fun confirmImport(urisToImport: List<Uri>, onImportConfirmed: () -> Unit) {
+    private fun confirmImport(amount: Int, onImportConfirmed: () -> Unit) {
         Dialogs.showConfirmDialog(
             this,
             String.format(
                 getString(R.string.import_sharted_question),
-                urisToImport.size
+                amount
             )
         ) { _, _ ->
             onImportConfirmed()
@@ -102,10 +111,13 @@ class MainActivity : BindableActivity<ActivityMainBinding>(R.layout.activity_mai
      * Start importing after the overview of photos.
      */
     @AfterPermissionGranted(REQ_PERM_SHARED_IMPORT)
-    fun startImportOfSharedUris(urisToImport: List<Uri>) {
+    fun startImportOfSharedUris() {
+        val urisToImport = viewModel.consumedUrisFromStore.value
+
         if (EasyPermissions.hasPermissions(
                 this,
-                Manifest.permission.READ_EXTERNAL_STORAGE
+                getReadImagesPermission(),
+                getReadVideosPermission()
             )
         ) {
             ImportBottomSheetDialogFragment(urisToImport).show(
@@ -117,7 +129,8 @@ class MainActivity : BindableActivity<ActivityMainBinding>(R.layout.activity_mai
                 this,
                 getString(R.string.import_permission_rationale),
                 REQ_PERM_SHARED_IMPORT,
-                Manifest.permission.READ_EXTERNAL_STORAGE
+                getReadImagesPermission(),
+                getReadVideosPermission()
             )
         }
     }

diff --git a/app/src/main/java/dev/leonlatsch/photok/main/ui/MainViewModel.kt b/app/src/main/java/dev/leonlatsch/photok/main/ui/MainViewModel.kt
@@ -21,6 +21,7 @@ import android.net.Uri
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dev.leonlatsch.photok.gallery.ui.importing.SharedUrisStore
 import dev.leonlatsch.photok.uicomponnets.bindings.ObservableViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
 import javax.inject.Inject
 
 /**
@@ -35,13 +36,12 @@ class MainViewModel @Inject constructor(
     private val sharedUrisStore: SharedUrisStore,
 ) : ObservableViewModel(app) {
 
+    val consumedUrisFromStore = MutableStateFlow(emptyList<Uri>())
+
     fun addUriToSharedUriStore(uri: Uri) = sharedUrisStore.safeAddUri(uri)
 
-    fun consumeSharedUris(): List<Uri> {
-        val sharedUris = sharedUrisStore.getUris()
+    fun consumeSharedUris() {
+        consumedUrisFromStore.value = sharedUrisStore.getUris()
         sharedUrisStore.clear()
-        return sharedUris
     }
-
-    fun getUriCountFromStore(): Int = sharedUrisStore.getUriCount()
 }
diff --git a/app/src/main/java/dev/leonlatsch/photok/other/Constants.kt b/app/src/main/java/dev/leonlatsch/photok/other/Constants.kt
@@ -28,5 +28,4 @@ const val INTENT_PHOTO_ID = "intent.photo.id"
 const val REQ_PERM_IMPORT_PHOTOS = 10
 const val REQ_PERM_IMPORT_VIDEOS = 11
 const val REQ_PERM_EXPORT = 12
-const val REQ_PERM_RESTORE = 13
 const val REQ_PERM_SHARED_IMPORT = 14
diff --git a/app/src/main/java/dev/leonlatsch/photok/permissions/MediaPermissions.kt b/app/src/main/java/dev/leonlatsch/photok/permissions/MediaPermissions.kt
@@ -0,0 +1,34 @@
+/*
+ *   Copyright 2020-2022 Leon Latsch
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package dev.leonlatsch.photok.permissions
+
+import android.Manifest
+import android.os.Build
+
+fun getReadVideosPermission() =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_VIDEO
+    } else {
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    }
+
+fun getReadImagesPermission() =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_IMAGES
+    } else {
+        Manifest.permission.READ_EXTERNAL_STORAGE
+    }
diff --git a/app/src/main/java/dev/leonlatsch/photok/uicomponnets/Chooser.kt b/app/src/main/java/dev/leonlatsch/photok/uicomponnets/Chooser.kt
@@ -47,7 +47,11 @@ class Chooser {
      * Or request the [permission]
      */
     fun show(fragment: Fragment) {
-        if (EasyPermissions.hasPermissions(fragment.requireContext(), permission)) {
+        if (permission == null || EasyPermissions.hasPermissions(
+                fragment.requireContext(),
+                permission
+            )
+        ) {
             val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
             intent.type = mimeType
             intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, allowMultiple)