1.0.3: Different fixes

Author: grigorevmp

app/build.gradle

@@ -25,8 +25,8 @@ android {
         applicationId "com.mikhailgrigorev.simple_password"
         minSdkVersion 23
         targetSdk 33
-        versionCode 2
-        versionName '1.0.1'
+        versionCode 4
+        versionName '1.0.3'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -103,7 +103,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'com.anjlab.android.iab.v3:library:2.0.3'
     implementation 'androidx.appcompat:appcompat:1.6.0'

app/release/app-release.apk

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 2,
-      "versionName": "1.0.1",
+      "versionCode": 4,
+      "versionName": "1.0.3",
       "outputFile": "app-release.apk"
     }
   ],

app/release/output-metadata.json

@@ -2,11 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
     <uses-permission android:name="com.android.vending.BILLING" />

app/src/main/AndroidManifest.xml

@@ -20,13 +20,17 @@ object BackupManager {
     }
 
     fun goToFileIntent(context: Context, file: File): Intent {
+        val contentUri = FileProvider.getUriForFile(
+                context,
+                "com.mikhailgrigorev.simple_password.provider",
+                file
+        )
+
+
         val intent = Intent(Intent.ACTION_VIEW)
-        val contentUri =
-                FileProvider.getUriForFile(context, "com.mikhailgrigorev.simple_password.fileprovider", file)
-        val mimeType = context.contentResolver.getType(contentUri)
-        intent.setDataAndType(contentUri, mimeType)
-        intent.flags =
-                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                .addFlags( Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+
+        intent.setDataAndType(contentUri, "text/comma-separated-values")
 
         return intent
     }

app/src/main/java/com/mikhailgrigorev/simple_password/common/manager/BackupManager.kt

@@ -7,6 +7,7 @@ import android.content.*
 import android.content.pm.PackageManager
 import android.database.Cursor
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.provider.DocumentsContract
 import android.provider.MediaStore
@@ -596,10 +597,14 @@ class PasswordCreateActivity : MyBaseActivity() {
     private val permissionCodeWrite = 1002
 
     private fun checkPermissionForImage() {
-        if ((checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED)
-            && (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED)
-        ) {
-            val permission = arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
+        val manifestPermission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Manifest.permission.READ_MEDIA_IMAGES
+        } else {
+            Manifest.permission.READ_EXTERNAL_STORAGE
+        }
+
+        if ((checkSelfPermission(manifestPermission) == PackageManager.PERMISSION_DENIED) && (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED)) {
+            val permission = arrayOf(manifestPermission)
             val permissionCoarse = arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
 
             requestPermissions(permission, permissionCodeRead)

app/src/main/java/com/mikhailgrigorev/simple_password/ui/password_card/create/PasswordCreateActivity.kt

@@ -108,6 +108,8 @@ class PasswordViewActivity : MyBaseActivity() {
 
     private fun loadPassword(passwordId: Int) {
         viewModel.getPasswordById(passwordId).observe(this) { passwordCard ->
+            if (passwordCard == null) return@observe
+
             viewModel.currentPassword = passwordCard
 
             setUpScreenContent(passwordCard)

app/src/main/java/com/mikhailgrigorev/simple_password/ui/password_card/view/PasswordViewActivity.kt

@@ -13,6 +13,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.autofill.AutofillManager
 import android.widget.SeekBar
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatDelegate
@@ -46,8 +47,8 @@ import javax.inject.Inject
 class SettingsFragment: Fragment() {
 
     companion object {
-        val IMPORT_FROM_PASSWORD_CODE = 5
-        val IMPORT_FROM_OLD_QUICKPASS = 11
+        const val IMPORT_FROM_PASSWORD_CODE = 5
+        const val IMPORT_FROM_OLD_APPLICATION = 11
     }
 
 
@@ -185,7 +186,7 @@ class SettingsFragment: Fragment() {
                                                     )
                                                 }
                                             }
-                                            IMPORT_FROM_OLD_QUICKPASS -> {
+                                            IMPORT_FROM_OLD_APPLICATION -> {
                                                 lifecycleScope.launch(Dispatchers.IO) {
                                                     viewModel.insertPassword(
                                                         PasswordCard(
@@ -526,11 +527,15 @@ class SettingsFragment: Fragment() {
                 val intent = this.context?.let {
                     goToFileIntent(it, csvFile)
                 }
-                startActivity(intent)
+                try {
+                    startActivity(intent)
+                } catch (e: Exception) {
+                    context?.let { Utils.makeToast(it, getString(R.string.sorry_there_is_no_application_to_view_csv_on_your_device)) }
+                }
             }
             // Utils.makeToast(requireContext(), "EXPORT_DB: Ok.")
         } else {
-            Utils.makeToast(requireContext(), "EXPORT_DB: Error.")
+            context?.let { Utils.makeToast(it, "EXPORT_DB: Error.") }
         }
     }
 

app/src/main/java/com/mikhailgrigorev/simple_password/ui/settings/SettingsFragment.kt

@@ -216,4 +216,5 @@
 
     <string name="import_db_failed">Произошла проблема с одним из паролей</string>
     <string name="import_db_folder_ok">Все пароли импортированы</string>
+    <string name="sorry_there_is_no_application_to_view_csv_on_your_device">Извините, на вашем девайсе нет приложения, чтобы просмотреть CSV-файл</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -101,7 +101,7 @@
     <string name="auto_copy_password">Auto-copy password</string>
     <string name="about_app">About app</string>
     <string name="app_author">Mikhail Grigorev</string>
-    <string name="version_and_year" translatable="false">v1.0.1 • 2023</string>
+    <string name="version_and_year" translatable="false">v1.0.2 • 2023</string>
     <string name="telegram" translatable="false">Telegram</string>
     <string name="vkontakte" translatable="false">Vkontakte</string>
     <string name="sen_email" translatable="false">Send email</string>
@@ -242,5 +242,6 @@
     <string name="local_profile">Local profile</string>
     <string name="import_db_failed">There is a problem with some passwords</string>
     <string name="import_db_folder_ok">All passwords imported</string>
+    <string name="sorry_there_is_no_application_to_view_csv_on_your_device">Sorry, there is no application to view CSV on your device</string>
 
 </resources>