From 2e5220fa8a8f3b0a37c83f7ebfa37462e953dc07 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 21 Aug 2019 12:23:44 +0200 Subject: [PATCH] Better file manager installation description --- .../activities/FileDatabaseSelectActivity.kt | 9 +-------- .../activities/dialogs/BrowserDialogFragment.kt | 8 ++++++-- .../main/res/layout/fragment_browser_install.xml | 15 ++++++++++----- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 6 +++--- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-lv/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-nn/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 33 files changed, 49 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt index 5711a5397..75fc34261 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -213,7 +213,6 @@ class FileDatabaseSelectActivity : StylishActivity(), private fun createNewFile() { try { startActivityForResult(Intent( - // TODO orientation change Intent.ACTION_CREATE_DOCUMENT).apply { addCategory(Intent.CATEGORY_OPENABLE) type = "application/x-keepass" @@ -222,13 +221,7 @@ class FileDatabaseSelectActivity : StylishActivity(), }, CREATE_FILE_REQUEST_CODE) } catch (e: Exception) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { - // Do the historic action to create a new database file - - } else { - // TODO show dialog - BrowserDialogFragment().show(supportFragmentManager, "browserDialog") - } + BrowserDialogFragment().show(supportFragmentManager, "browserDialog") } } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt index 80c9f04cb..d23a0de6e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt @@ -24,6 +24,7 @@ import android.os.Bundle import android.support.v4.app.DialogFragment import android.support.v7.app.AlertDialog import android.widget.Button +import android.widget.TextView import com.kunzisoft.keepass.R import com.kunzisoft.keepass.utils.Util @@ -37,13 +38,16 @@ class BrowserDialogFragment : DialogFragment() { builder.setView(root) .setNegativeButton(R.string.cancel) { _, _ -> } - val market = root.findViewById