From fa73a30bf49239f374c562730a0ffe1104f33016 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Tue, 17 Jan 2017 21:12:25 -0500 Subject: [PATCH 1/4] Use string const for button There is a string for the "Use external application" button, but it was not used. --- app/src/main/res/layout/import_export_activity.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/import_export_activity.xml b/app/src/main/res/layout/import_export_activity.xml index 64a3789ea..7d3f7fc76 100644 --- a/app/src/main/res/layout/import_export_activity.xml +++ b/app/src/main/res/layout/import_export_activity.xml @@ -128,8 +128,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="8dp" - android:text="Use external application" /> - + android:text="@string/importOptionApplicationButton" /> Date: Sat, 28 Jan 2017 16:18:25 -0500 Subject: [PATCH 2/4] correct "Use external application" title The title mistakenly said filesystem. --- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f0211d658..c346f4a52 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -68,7 +68,7 @@ Import ze souborového systému Vyberte konkrétní soubor v uložišti. Ze souborového systému - Import ze souborového systému + Použít externí aplikaci K otevření souboru použije externí aplikaci jako Dropbox, Google Drive, nebo vámi preferovaný prohlížeč souborů. Použít externí aplikaci Import z umístění exportu diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 19670b105..34a490d2e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -57,7 +57,7 @@ Importiere vom Dateisystem Wähle eine Datei im Speicher aus. Vom Dateisystem - Importiere vom Dateisystem + Nutze eine externe App Wähle eine Datei aus einer App wie Dropbox, Google Drive, oder deinem bevorzugten Dateisystem aus. Nutze eine externe App Importiere vom Export Ort diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a203fb193..302d64169 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -69,7 +69,7 @@ Importer depuis le système de fichiers. Choisissez le fichier à importer. Système de fichiers - Importer depuis le système de fichiers + Application externe Utilisez une application externe comme Dropbox, Google Drive, ou votre gestionnaire de fichiers favori pour ouvrir un fichier. Application externe Importer depuis le même emplacement que pour l\'export diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 18e0b2b22..1d49fac54 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -65,7 +65,7 @@ Importa dal file system Scegli un file dal file system. Dal file system - Importa dal file system + Usa un\'applicazione esterna Usa un\'applicazione esterna come Dropbox, Google Drive o il tuo file manager preferito per aprire il file. Usa un\'applicazione esterna Importa da un altro posto diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 0983381a9..25517b0e8 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -69,7 +69,7 @@ Import from filesystem Choose a specific file from the filesystem. From filesystem - Import from filesystem + Use external application Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file. Use external application Import from export location diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 06224d9a7..b1a57c2e6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -66,7 +66,7 @@ Importeer van filesysteem Kies een specifiek bestand van het filesysteem. Van filesysteem - Importeer van filesysteem + Gebruik externe applicatie Gebruik een externe applicatie zoals Dropbox, Google Drive of je favoriete bestandsbeheer om een bestand te openen. Gebruik externe applicatie Importeer van exporteerlocatie diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd8d7634a..9de380169 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,7 +57,7 @@ Import from filesystem Choose a specific file from the filesystem. From filesystem - Import from filesystem + Use external application Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file. Use external application Import from export location From 9c74b2a2642828a81dfc3dd6b333b90b32f67d20 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sat, 28 Jan 2017 16:18:49 -0500 Subject: [PATCH 3/4] Correct typo in comment --- app/src/main/java/protect/card_locker/ImportExportActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java index 14d688637..76399a2ee 100644 --- a/app/src/main/java/protect/card_locker/ImportExportActivity.java +++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java @@ -52,7 +52,7 @@ public class ImportExportActivity extends AppCompatActivity } // If the application does not have permissions to external - // storage, as for it now + // storage, ask for it now if (ContextCompat.checkSelfPermission(ImportExportActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || From 3f5bcbb9416aeb4efa37546326fdd2b1eb74e989 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sat, 28 Jan 2017 16:19:21 -0500 Subject: [PATCH 4/4] Add log message when exporting data --- app/src/main/java/protect/card_locker/ImportExportTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/ImportExportTask.java b/app/src/main/java/protect/card_locker/ImportExportTask.java index a883d9761..5aceacb96 100644 --- a/app/src/main/java/protect/card_locker/ImportExportTask.java +++ b/app/src/main/java/protect/card_locker/ImportExportTask.java @@ -76,6 +76,8 @@ class ImportExportTask extends AsyncTask Log.e(TAG, "Unable to export file", e); } + Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result); + return result; } @@ -126,9 +128,9 @@ class ImportExportTask extends AsyncTask progress.dismiss(); Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled"); } - interface TaskCompleteListener { void onTaskComplete(boolean success, File file); } + }