#490

ZipUtils now saves and loads from Familiar's internal directory
ZipUtils now shows a more useful error message including file name and directory for a long time

build.gradle

@@ -30,7 +30,7 @@ buildscript {
         maven { url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.8'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

mobile/src/main/java/com/gelakinetic/mtgfam/helpers/SnackbarWrapper.java

@@ -34,6 +34,8 @@ public class SnackbarWrapper {
 
     public static final int LENGTH_LONG = Snackbar.LENGTH_LONG;
     public static final int LENGTH_SHORT = Snackbar.LENGTH_SHORT;
+    public static final int LENGTH_XLONG = 2750 * 3; // Three times long, see SnackbarManager.LONG_DURATION_MS
+
     private static Snackbar mSnackbar;
 
     /**

mobile/src/main/java/com/gelakinetic/mtgfam/helpers/ZipUtils.java

@@ -25,6 +25,7 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Environment;
+
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
@@ -83,7 +84,7 @@ public static void exportData(Activity activity) {
         ArrayList<File> files = findAllFiles(activity.getFilesDir(),
                 new File(sharedPrefsDir));
 
-        File sdCard = Environment.getExternalStorageDirectory();
+        File sdCard = activity.getFilesDir();
         File zipOut = new File(sdCard, BACKUP_FILE_NAME);
         if (zipOut.exists()) {
             if (!zipOut.delete()) {
@@ -131,11 +132,15 @@ public static void importData(Activity activity) {
         }
 
         /* Try unzipping the file */
-        try (ZipFile zipFile = new ZipFile(new File(Environment.getExternalStorageDirectory(), BACKUP_FILE_NAME))) {
+        try (ZipFile zipFile = new ZipFile(new File(activity.getFilesDir(), BACKUP_FILE_NAME))) {
             unZipIt(zipFile, activity);
             SnackbarWrapper.makeAndShowText(activity, R.string.main_import_success, SnackbarWrapper.LENGTH_SHORT);
         } catch (IOException e) {
-            SnackbarWrapper.makeAndShowText(activity, R.string.main_import_fail, SnackbarWrapper.LENGTH_SHORT);
+            SnackbarWrapper.makeAndShowText(activity,
+                    String.format(activity.getString(R.string.main_import_fail),
+                            BACKUP_FILE_NAME,
+                            activity.getFilesDir().getAbsolutePath()),
+                    SnackbarWrapper.LENGTH_XLONG);
         }
     }
 

mobile/src/main/res/values-de/strings.xml

@@ -81,7 +81,7 @@
 <string name="main_export_fail">"Konnte die Daten nicht auf der SD-Karte speichern"</string>
 <string name="main_import_data_title">"Daten von der SD-Karte laden"</string>
 <string name="main_import_success">"Importieren erfolgreich"</string>
-<string name="main_import_fail">"Importieren fehlgeschlagen. Bitte speicher die Datei MTGFamiliarBackup.zip im Stammverzeichnis deiner SD-Karte ab."</string>
+<string name="main_import_fail">"Importieren fehlgeschlagen. Bitte speicher die Datei %1$s im %2$s."</string>
 <string name="main_about">"Über diese App"</string>
 
 <!-- Some grammar corrections and changes in language tone. -->

mobile/src/main/res/values-es/strings.xml

@@ -71,7 +71,7 @@
 <string name="main_export_fail">"La exportación de datos a la tarjeta SD ha fallado"</string>
 <string name="main_import_data_title">"Importar datos de la SD"</string>
 <string name="main_import_success">"Datos importados correctamente"</string>
-<string name="main_import_fail">"Importación fallida. Por favor pon MTGFamiliarBackup.zip en el directorio raíz de tu tarjeta SD."</string>
+<string name="main_import_fail">"Importación fallida. Por favor pon %1$s en %2$s."</string>
 <string name="main_about">"Acerca de"</string>
 <string name="main_about_text">"Esta aplicación es mi regalo a la comunidad de MTG.&lt;br&gt;
 &lt;br&gt;

mobile/src/main/res/values-fr/strings.xml

@@ -69,7 +69,7 @@
 <string name="main_export_fail">"Echec de l'export des données vers carte SD"</string>
 <string name="main_import_data_title">"Import depuis SD"</string>
 <string name="main_import_success">"Import réalisé avec succès"</string>
-<string name="main_import_fail">"Echec de l'import. Veuillez placer MTGFamiliarBackup.zip à la racine de votre carte SD"</string>
+<string name="main_import_fail">"Echec de l'import. Veuillez placer %1$s dans %2$s"</string>
 <string name="main_about">"A propos"</string>
 <string name="main_about_text">"Cette appli est mon cadeau à la communauté MTG.&lt;br&gt;
 &lt;br&gt;

mobile/src/main/res/values-it/strings.xml

@@ -71,7 +71,7 @@
 <string name="main_export_fail">"Salvataggio dei dati sulla scheda SD fallito"</string>
 <string name="main_import_data_title">"Carica dati dalla scheda SD"</string>
 <string name="main_import_success">"Caricamento completato"</string>
-<string name="main_import_fail">"Caricamento fallito. Metti il file MTGFamiliarBackup.zip nella cartella files dei dati di quest app"</string>
+<string name="main_import_fail">"Caricamento fallito. Metti il file %1$s nella %2$s"</string>
 <string name="main_about">"Info"</string>
 <string name="main_about_text">"Questa app è il mio regalo per la comunità di MTG.&lt;br&gt;
 &lt;br&gt;

mobile/src/main/res/values-pl/strings.xml

@@ -69,7 +69,7 @@
 <string name="main_export_fail">"Nie udało się zapisać danych na karcie SD"</string>
 <string name="main_import_data_title">"Wczytaj dane z karty SD"</string>
 <string name="main_import_success">"Import zakończony powodzeniem"</string>
-<string name="main_import_fail">"Nie udało się zaimportować danych. Proszę wstawić MTGFamiliarBackup.zip w root'a swojej karty SD"</string>
+<string name="main_import_fail">"Nie udało się zaimportować danych. Proszę wstawić %1$s w %2$s"</string>
 <string name="main_about">"O aplikacji"</string>
 <string name="main_about_text">"Ta aplikacja jest moim darem dla społeczności MTG&lt;br&gt;
 &lt;br&gt;

mobile/src/main/res/values-pt/strings.xml

@@ -71,7 +71,7 @@
 <string name="main_export_fail">"Falha ao salvar dados no cartão SD"</string>
 <string name="main_import_data_title">"Importar Dados do SD"</string>
 <string name="main_import_success">"Dados importados com sucesso"</string>
-<string name="main_import_fail">"A importação falhou. Por favor, coloque MTGFamiliarBackup.zip no diretório raiz do seu cartão SD."</string>
+<string name="main_import_fail">"A importação falhou. Por favor, coloque %1$s no %2$s."</string>
 <string name="main_about">"Sobre"</string>
 <string name="main_about_text">"Este aplicativo é o meu presente para a comunidade MTG.&lt;br&gt;
 &lt;br&gt;

mobile/src/main/res/values-sk/strings.xml

@@ -70,7 +70,7 @@
 <string name="main_export_fail">"Nepodarilo sa uložiť dáta na SD kartu "</string>
 <string name="main_import_data_title">"Načítať dáta z SD"</string>
 <string name="main_import_success">"Načítanie bolo úspešné"</string>
-<string name="main_import_fail">"Načítanie zlyhalo. Prosím vložte MTGFamiliarBackup.zip do koreňového adresára SD karty"</string>
+<string name="main_import_fail">"Načítanie zlyhalo. Prosím vložte %1$s do %2$s"</string>
 <string name="main_about">"O aplikácii"</string>
 <string name="main_about_text">"Táto aplikácia je môj darček pre MTG komunitu.&lt;br&gt;
 &lt;br&gt;

mobile/src/main/res/values/strings.xml

@@ -93,7 +93,7 @@
     <string name="main_export_fail">"Failed to save data to SD card"</string>
     <string name="main_import_data_title">"Load Data from SD"</string>
     <string name="main_import_success">"Load succeeded"</string>
-    <string name="main_import_fail">"Load failed. Please put MTGFamiliarBackup.zip in the root of your SD card"</string>
+    <string name="main_import_fail">"Load failed. Please put %1$s in %2$s"</string>
     <string name="main_about">"About"</string>
     <string name="main_about_text">"This app is my gift to the MTG community.&lt;br&gt;
 &lt;br&gt;