Fix file manager dialog

This commit is contained in:
J-Jamet
2020-04-30 16:30:52 +02:00
parent e347aefcd9
commit 8846918e55
37 changed files with 13 additions and 93 deletions

View File

@@ -28,7 +28,7 @@ import android.widget.TextView
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.UriUtil
class BrowserDialogFragment : DialogFragment() {
class FileManagerDialogFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity ->
@@ -41,15 +41,8 @@ class BrowserDialogFragment : DialogFragment() {
val textDescription = root.findViewById<TextView>(R.id.file_manager_install_description)
textDescription.text = getString(R.string.file_manager_install_description)
val market = root.findViewById<Button>(R.id.file_manager_install_play_store)
market.setOnClickListener {
UriUtil.gotoUrl(context!!, R.string.file_manager_play_store)
dismiss()
}
val web = root.findViewById<Button>(R.id.file_manager_install_f_droid)
web.setOnClickListener {
UriUtil.gotoUrl(context!!, R.string.file_manager_f_droid)
root.findViewById<Button>(R.id.file_manager_button).setOnClickListener {
UriUtil.gotoUrl(requireContext(), R.string.file_manager_explanation_url)
dismiss()
}

View File

@@ -31,7 +31,7 @@ import android.util.Log
import android.view.View
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import com.kunzisoft.keepass.activities.dialogs.BrowserDialogFragment
import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
import com.kunzisoft.keepass.utils.UriUtil
class OpenFileHelper {
@@ -164,10 +164,10 @@ class OpenFileHelper {
*/
private fun showBrowserDialog() {
try {
val browserDialogFragment = BrowserDialogFragment()
val fileManagerDialogFragment = FileManagerDialogFragment()
fragment?.let {
browserDialogFragment.show(it.parentFragmentManager, "browserDialog")
} ?: browserDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
fileManagerDialogFragment.show(it.parentFragmentManager, "browserDialog")
} ?: fileManagerDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
} catch (e: Exception) {
Log.e(TAG, "Can't open BrowserDialog", e)
}

View File

@@ -25,7 +25,7 @@ import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import androidx.fragment.app.FragmentActivity
import com.kunzisoft.keepass.activities.dialogs.BrowserDialogFragment
import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
private var CREATE_FILE_REQUEST_CODE_DEFAULT = 3853
@@ -60,10 +60,10 @@ fun createDocument(activity: FragmentActivity,
}, idCode)
return idCode
} catch (e: Exception) {
BrowserDialogFragment().show(activity.supportFragmentManager, "browserDialog")
FileManagerDialogFragment().show(activity.supportFragmentManager, "browserDialog")
}
} else {
BrowserDialogFragment().show(activity.supportFragmentManager, "browserDialog")
FileManagerDialogFragment().show(activity.supportFragmentManager, "browserDialog")
}
return null

View File

@@ -36,18 +36,11 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<Button
android:id="@+id/file_manager_install_play_store"
android:id="@+id/file_manager_button"
android:layout_margin="@dimen/button_margin"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/install_from_play_store" />
<Button
android:id="@+id/file_manager_install_f_droid"
android:layout_margin="@dimen/button_margin"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/install_from_f_droid" />
android:text="@string/file_browser" />
</LinearLayout>
</LinearLayout>

View File

@@ -58,8 +58,6 @@
<string name="hint_length">الطول</string>
<string name="hint_pass">كلمة السر</string>
<string name="password">كلمة السر</string>
<string name="install_from_play_store">التثبيت مِن متجر غوغل للتطبيقات</string>
<string name="install_from_f_droid">التثبيت مِن مستودَع أف-درويد للتطبيقات</string>
<string name="invalid_algorithm">خوارزمية خاطئة.</string>
<string name="length">الطول</string>
<string name="list_size_title">عدد عناصر القائمة</string>

View File

@@ -77,8 +77,6 @@
<string name="hint_length">longitud</string>
<string name="hint_pass">contrasenya</string>
<string name="password">Contrasenya</string>
<string name="install_from_play_store">Instal·la de la Play Store</string>
<string name="install_from_f_droid">Instal·la de la F-Droid</string>
<string name="invalid_credentials">Contrasenya o arxiu clau invàlids.</string>
<string name="invalid_db_sig">Format de base de dades desconegut.</string>
<string name="length">Longitud</string>

View File

@@ -83,8 +83,6 @@
<string name="hint_length">Délka</string>
<string name="hint_pass">Heslo</string>
<string name="password">Heslo</string>
<string name="install_from_play_store">Instalovat z katalogu Play Store</string>
<string name="install_from_f_droid">Instalovat z katalogu F-Droid</string>
<string name="invalid_credentials">Nebylo možno načíst autentizační údaje. Pokud se chyba opakuje, databázový soubor může být poškozen.</string>
<string name="invalid_algorithm">Nesprávný algoritmus.</string>
<string name="invalid_db_sig">Nedaří se rozpoznat formát databáze.</string>

View File

@@ -82,8 +82,6 @@
<string name="hint_length">Længde</string>
<string name="hint_pass">Adgangskode</string>
<string name="password">Adgangskode</string>
<string name="install_from_play_store">Installer fra Google Play</string>
<string name="install_from_f_droid">Installer fra F-Droid</string>
<string name="invalid_credentials">Legitimationsoplysningerne kunne ikke læses. Hvis det sker igen, kan databasefilen være beskadiget.</string>
<string name="invalid_algorithm">Forkert algoritme.</string>
<string name="invalid_db_sig">Kunne ikke genkende databaseformat.</string>

View File

@@ -92,8 +92,6 @@
<string name="hint_length">Länge</string>
<string name="hint_pass">Passwort</string>
<string name="password">Passwort</string>
<string name="install_from_play_store">Google Play</string>
<string name="install_from_f_droid">F-Droid</string>
<string name="invalid_credentials">Die Anmeldeinformationen konnten nicht gelesen werden. Wenn dies erneut auftritt, kann Ihre Datenbankdatei beschädigt sein.</string>
<string name="invalid_algorithm">Falscher Algorithmus.</string>
<string name="invalid_db_sig">Datenbankformat nicht erkannt.</string>

View File

@@ -84,8 +84,6 @@
<string name="hint_length">Μήκος</string>
<string name="hint_pass">Κωδικός</string>
<string name="password">Κωδικός Πρόσβασης</string>
<string name="install_from_play_store">Εγκατάσταση από το Play Store</string>
<string name="install_from_f_droid">Εγκατάσταση από το F-Droid</string>
<string name="invalid_credentials">Δεν ήταν δυνατή η ανάγνωση διαπιστευτηρίων. Εάν αυτό επαναληφθεί, το αρχείο της βάσης δεδομένων ενδέχεται να είναι κατεστραμμένο.</string>
<string name="invalid_algorithm">Λάθος αλγόριθμος.</string>
<string name="invalid_db_sig">Δεν ήταν δυνατή η αναγνώριση της μορφής της βάσης δεδομένων.</string>

View File

@@ -78,8 +78,6 @@
<string name="hint_length">longitud</string>
<string name="password">Contraseña</string>
<string name="hint_pass">contraseña</string>
<string name="install_from_play_store">Instalar desde Play Store</string>
<string name="install_from_f_droid">Instalar desde F-Droid</string>
<string name="invalid_credentials">Contraseña o archivo de clave no válido.</string>
<string name="invalid_db_sig">No se pudo reconocer el formato de la base de datos.</string>
<string name="length">Longitud</string>

View File

@@ -85,8 +85,6 @@
<string name="hint_length">luzera</string>
<string name="hint_pass">pasahitza</string>
<string name="password">Pasahitza</string>
<string name="install_from_play_store">Play store-etik Instalatu</string>
<string name="install_from_f_droid">F-Droid-etik Instalatu</string>
<string name="invalid_credentials">Pasahitz edo gako fitxategi baliogabea.</string>
<string name="invalid_algorithm">Algoritmo baliogabea.</string>
<string name="invalid_db_sig">Datubase formato ez ezaguna.</string>

View File

@@ -84,8 +84,6 @@
<string name="hint_length">pituus</string>
<string name="hint_pass">salasana</string>
<string name="password">Salasana</string>
<string name="install_from_play_store">Asenna Play Storesta</string>
<string name="install_from_f_droid">Asenna F-Droid</string>
<string name="invalid_credentials">Väärä salasana tai avaintiedosto.</string>
<string name="invalid_algorithm">Epäkelpo algoritmi.</string>
<string name="invalid_db_sig">Salasanatietokannan tyyppiä ei tunnistettu.</string>

View File

@@ -91,8 +91,6 @@
<string name="hint_length">Longueur</string>
<string name="hint_pass">Mot de passe</string>
<string name="password">Mot de passe</string>
<string name="install_from_play_store">Installer depuis Google Play</string>
<string name="install_from_f_droid">Installer depuis F-Droid</string>
<string name="invalid_credentials">Impossible de lire les identifiants. Si cela se reproduit, votre fichier de base de données est peut-être corrompu.</string>
<string name="invalid_algorithm">Algorithme invalide.</string>
<string name="invalid_db_sig">Impossible de reconnaître le format de la base de données.</string>

View File

@@ -105,8 +105,6 @@
<string name="hint_length">Duljina</string>
<string name="hint_pass">Lozinka</string>
<string name="password">Lozinka</string>
<string name="install_from_f_droid">Instaliraj iz trgovine F-Droid</string>
<string name="install_from_play_store">Instaliraj iz trgovine Play Store</string>
<string name="invalid_algorithm">Pogrešan algoritam.</string>
<string name="invalid_db_same_uuid">%1$s s istim UUID %2$s već postoji.</string>
<string name="invalid_db_sig">Nije moguće prepoznati format baze podataka.</string>

View File

@@ -84,8 +84,6 @@
<string name="hint_length">hosszúság</string>
<string name="hint_pass">jelszó</string>
<string name="password">Jelszó</string>
<string name="install_from_play_store">Telepítés a Play Áruházból</string>
<string name="install_from_f_droid">Telepítés az F-Droidból</string>
<string name="invalid_credentials">A jelszó vagy kulcsfájl nem olvasható.</string>
<string name="invalid_algorithm">Hibás algoritmus.</string>
<string name="invalid_db_sig">Az adatbázis formátuma nem ismerhető fel.</string>

View File

@@ -86,8 +86,6 @@
<string name="hint_length">Lunghezza</string>
<string name="password">Password</string>
<string name="hint_pass">Password</string>
<string name="install_from_play_store">Installa dal Play Store</string>
<string name="install_from_f_droid">Installa dal F-Droid</string>
<string name="invalid_credentials">Non è possibile leggere le credenziali. Se questo dovesse riaccadere, il file del databese potrebbe essere corrotto.</string>
<string name="invalid_algorithm">Algoritmo errato.</string>
<string name="invalid_db_sig">Formato database non riconosciuto.</string>

View File

@@ -83,8 +83,6 @@
<string name="hint_length">אורך</string>
<string name="hint_pass">סיסמה</string>
<string name="password">סיסמה</string>
<string name="install_from_play_store">התקן מחנות Play</string>
<string name="install_from_f_droid">התקן מהאינטרנט</string>
<string name="invalid_credentials">סיסמה או קובץ מפתח לא מתאימים.</string>
<string name="invalid_algorithm">אלגוריתם לא חוקי.</string>
<string name="invalid_db_sig">תבנית מסד הנתונים אינה מזוהה.</string>

View File

@@ -76,8 +76,6 @@
<string name="hint_length">長さ</string>
<string name="password">パスワード</string>
<string name="hint_pass">パスワード</string>
<string name="install_from_play_store">Play Storeで入手</string>
<string name="install_from_f_droid">F-Droidで入手</string>
<string name="invalid_credentials">パスワード/キーファイルが違います。</string>
<string name="invalid_db_sig">データベースフォーマットが認識できません。</string>
<string name="length">生成するパスワードの長さ</string>

View File

@@ -93,8 +93,6 @@
<string name="hint_length">길이</string>
<string name="hint_pass">비밀번호</string>
<string name="password">비밀번호</string>
<string name="install_from_f_droid">F-Droid에서 설치</string>
<string name="install_from_play_store">플레이 스토어에서 설치</string>
<string name="invalid_credentials">비밀번호나 키 파일을 읽을 수 없습니다.</string>
<string name="invalid_algorithm">잘못된 알고리즘입니다.</string>
<string name="invalid_db_sig">데이터베이스 형식을 인식할 수 없습니다.</string>

View File

@@ -82,8 +82,6 @@
<string name="hint_length">garums</string>
<string name="hint_pass">parole</string>
<string name="password">Parole</string>
<string name="install_from_play_store">Instalēt no Play veikala</string>
<string name="install_from_f_droid">Instalēt no F-Droid</string>
<string name="invalid_credentials">Nederīga parole vai atslēgas fails.</string>
<string name="invalid_algorithm">Nederīgs algoritms.</string>
<string name="invalid_db_sig">Datu bāzes formāts nav atpazīts.</string>

View File

@@ -94,8 +94,6 @@
<string name="hint_length">lengde</string>
<string name="hint_pass">passord</string>
<string name="password">Passord</string>
<string name="install_from_play_store">Installer fra Play-butikken</string>
<string name="install_from_f_droid">Installer fra F-Droid</string>
<string name="invalid_credentials">Ugyldig passord eller nøkkelfil.</string>
<string name="invalid_algorithm">Ugyldig algoritme.</string>
<string name="invalid_db_sig">Fremmed databaseformat.</string>

View File

@@ -78,8 +78,6 @@
<string name="hint_length">lengte</string>
<string name="password">Wachtwoord</string>
<string name="hint_pass">wachtwoord</string>
<string name="install_from_play_store">Installeren via Play Store</string>
<string name="install_from_f_droid">Installeren via F-Droid</string>
<string name="invalid_credentials">Ongeldig wachtwoord of sleutelbestand.</string>
<string name="invalid_db_sig">Databankformaat kan niet worden herkend.</string>
<string name="length">Lengte</string>

View File

@@ -76,8 +76,6 @@
<string name="hint_length">lengd</string>
<string name="password">Passord</string>
<string name="hint_pass">passord</string>
<string name="install_from_play_store">Installer frå Play Store</string>
<string name="install_from_f_droid">Installer frå F-Droid</string>
<string name="invalid_credentials">Ugyldig passord eller nøkkelfil.</string>
<string name="invalid_db_sig">Ukjent databaseformat.</string>
<string name="length">Lengd</string>

View File

@@ -75,8 +75,6 @@
<string name="hint_length">Długość</string>
<string name="password">Hasło</string>
<string name="hint_pass">Hasło</string>
<string name="install_from_play_store">Zainstaluj z Play-Store</string>
<string name="install_from_f_droid">Zainstaluj z F-Droid</string>
<string name="invalid_credentials">Nie można odczytać uwierzytelnień. Jeśli to się powtórzy, plik bazy danych może być uszkodzony.</string>
<string name="invalid_db_sig">Nie można rozpoznać formatu bazy danych.</string>
<string name="length">Długość</string>

View File

@@ -76,8 +76,6 @@
<string name="hint_length">tamanho</string>
<string name="password">Senha</string>
<string name="hint_pass">senha</string>
<string name="install_from_play_store">Instalar a partir do Google Play</string>
<string name="install_from_f_droid">Instalar a partir do F-Droid</string>
<string name="invalid_credentials">Não foi possível ler credenciais. Se isso ocorrer novamente, seu arquivo de banco de dados pode estar corrompido.</string>
<string name="invalid_db_sig">Não pôde reconhecer formato do banco de dados.</string>
<string name="length">Tamanho</string>

View File

@@ -85,8 +85,6 @@
<string name="hint_length">comprimento</string>
<string name="hint_pass">palavra-chave</string>
<string name="password">Palavra-chave</string>
<string name="install_from_play_store">Instalar pela Play Store</string>
<string name="install_from_f_droid">Instalar pela F-Droid</string>
<string name="invalid_credentials">Palavra-chave ou ficheiro chave inválidos.</string>
<string name="invalid_algorithm">Algoritmo errado.</string>
<string name="invalid_db_sig">Não pôde reconhecer formato do banco de dados.</string>

View File

@@ -136,8 +136,6 @@
<string name="hint_length">Lungime</string>
<string name="hint_pass">Parola</string>
<string name="password">Parola</string>
<string name="install_from_f_droid">Instalați din F-Droid</string>
<string name="install_from_play_store">Instalați din Play Store</string>
<string name="invalid_credentials">Nu s-a putut citi datele de acreditare. Dacă reîncepe, baza de date a dumneavoastra poate fi coruptă.</string>
<string name="invalid_algorithm">Algoritm greșit.</string>
<string name="invalid_db_same_uuid">%1$s cu același UUID %2$s există deja.</string>

View File

@@ -86,8 +86,6 @@
<string name="hint_length">Длина</string>
<string name="hint_pass">Пароль</string>
<string name="password">Пароль</string>
<string name="install_from_play_store">Google Play</string>
<string name="install_from_f_droid">F-Droid</string>
<string name="invalid_credentials">Неправильный главный пароль или файл ключа. Если это повторяется, файл базы, возможно, повреждён.</string>
<string name="invalid_algorithm">Неправильный алгоритм.</string>
<string name="invalid_db_sig">Невозможно определить формат базы.</string>

View File

@@ -76,8 +76,6 @@
<string name="hint_length">dĺžka</string>
<string name="password">Heslo</string>
<string name="hint_pass">heslo</string>
<string name="install_from_play_store">Inštalovať z Play Store</string>
<string name="install_from_f_droid">Inštalovať z F-Droid</string>
<string name="invalid_credentials">Chybné heslo, alebo súbor keyfile.</string>
<string name="invalid_db_sig">Formát Databázy nerozpoznaný.</string>
<string name="length">Dĺžka</string>

View File

@@ -84,8 +84,6 @@
<string name="hint_length">längd</string>
<string name="hint_pass">lösenord</string>
<string name="password">Lösenord</string>
<string name="install_from_play_store">Installera från Play Store</string>
<string name="install_from_f_droid">Installera från F-Droid</string>
<string name="invalid_credentials">Det gick inte att läsa autentiseringsuppgifterna. Om detta inträffar igen kan det bero på att databasfilen är skadad.</string>
<string name="invalid_algorithm">Fel algoritm.</string>
<string name="invalid_db_sig">Det gick inte att känna igen databasformatet.</string>

View File

@@ -94,8 +94,6 @@
<string name="hint_length">Uzunluk</string>
<string name="hint_pass">Parola</string>
<string name="password">Parola</string>
<string name="install_from_f_droid">F-Droid\'den yükleyin</string>
<string name="install_from_play_store">Play Store\'dan yükleyin</string>
<string name="invalid_credentials">Kimlik bilgileri okunamadı. Bu tekrar ederse, veritabanı dosyanız bozuk olabilir.</string>
<string name="invalid_algorithm">Yanlış algoritma.</string>
<string name="invalid_db_sig">Veritabanı biçimi tanımlanamadı.</string>

View File

@@ -76,8 +76,6 @@
<string name="hint_length">довжина</string>
<string name="password">Пароль</string>
<string name="hint_pass">пароль</string>
<string name="install_from_play_store">Інсталювати із Google Play</string>
<string name="install_from_f_droid">Інсталювати із F-Droid</string>
<string name="invalid_credentials">Невірний пароль або файл ключа.</string>
<string name="invalid_db_sig">Формат бази даних не розпізнано.</string>
<string name="length">Довжина</string>

View File

@@ -77,8 +77,6 @@
<string name="hint_length">长度</string>
<string name="password">密码</string>
<string name="hint_pass">密码</string>
<string name="install_from_play_store">从Play商店安装</string>
<string name="install_from_f_droid">从F-Droid安装</string>
<string name="invalid_credentials">无法读取您的密码或密钥文件。如果重试后仍然如此,你的数据库可能已经损坏。</string>
<string name="invalid_db_sig">无法识别数据库格式。</string>
<string name="length">长度</string>

View File

@@ -76,8 +76,6 @@
<string name="hint_length">長度</string>
<string name="password">密碼</string>
<string name="hint_pass">密碼</string>
<string name="install_from_play_store">從 Play 商店安裝</string>
<string name="install_from_f_droid">從 F-Droid 安裝</string>
<string name="invalid_credentials">無效的密碼或密鑰檔。</string>
<string name="invalid_db_sig">資料庫格式無法識別。</string>
<string name="length">長度</string>

View File

@@ -34,8 +34,6 @@
<string name="contribution_url" translatable="false">https://www.keepassdx.com/contribution</string>
<string name="homepage_url" translatable="false">https://www.keepassdx.com</string>
<string name="issues_url" translatable="false">https://github.com/Kunzisoft/KeePassDX/issues</string>
<string name="file_manager_play_store" translatable="false">TODO file manager</string>
<string name="file_manager_f_droid" translatable="false">TODO file manager</string>
<string name="field_references_url" translatable="false">https://keepass.info/help/base/fieldrefs.html</string>
<string name="advanced_unlock_explanation_url" translatable="false">https://github.com/Kunzisoft/KeePassDX/wiki/Advanced-Unlocking</string>
<string name="magic_keyboard_explanation_url" translatable="false">https://github.com/Kunzisoft/KeePassDX/wiki/Magikeyboard</string>

View File

@@ -135,7 +135,7 @@
<string name="field_name">Field name</string>
<string name="field_value">Field value</string>
<string name="file_not_found_content">Could not find file. Try reopening it from your file browser.</string>
<string name="file_browser">File browser</string>
<string name="file_browser">File manager</string>
<string name="generate_password">Generate password</string>
<string name="hint_conf_pass">Confirm password</string>
<string name="hint_generated_password">Generated password</string>
@@ -144,8 +144,6 @@
<string name="hint_length">Length</string>
<string name="hint_pass">Password</string>
<string name="password">Password</string>
<string name="install_from_f_droid">Install from F-Droid</string>
<string name="install_from_play_store">Install from Play Store</string>
<string name="invalid_credentials">Could not read credentials. If this reoccurs, your database file may be corrupted.</string>
<string name="invalid_algorithm">Wrong algorithm.</string>
<string name="invalid_db_same_uuid">%1$s with the same UUID %2$s already exists.</string>