commit da55a22815c0727d2d6a1d351eae5bd21a249321
Author: Fabio Mazza <fab4mazz@gmail.com>
Date:   Thu Feb 29 20:33:31 2024 +0100

    Load data from zip, put string and options

diff --git a/app/src/main/java/it/reyboz/bustorino/data/DBUpdateWorker.java b/app/src/main/java/it/reyboz/bustorino/data/DBUpdateWorker.java
index 8acd918..9ad512e 100644
--- a/app/src/main/java/it/reyboz/bustorino/data/DBUpdateWorker.java
+++ b/app/src/main/java/it/reyboz/bustorino/data/DBUpdateWorker.java
@@ -76,13 +76,13 @@ public class DBUpdateWorker extends Worker{
         final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(getApplicationContext());
         final int notification_ID = 32198;
         final SharedPreferences shPr = con.getSharedPreferences(con.getString(R.string.mainSharedPreferences),MODE_PRIVATE);
-        final int current_DB_version = shPr.getInt(DatabaseUpdate.DB_VERSION_KEY,-10);
+        final int current_DB_version = shPr.getInt(PreferencesHolder.DB_GTT_VERSION_KEY,-10);
 
         final int new_DB_version = DatabaseUpdate.getNewVersion();
 
         final boolean isUpdateCompulsory = getInputData().getBoolean(FORCED_UPDATE,false);
 
-        final long lastDBUpdateTime = shPr.getLong(DatabaseUpdate.DB_LAST_UPDATE_KEY, 0);
+        final long lastDBUpdateTime = shPr.getLong(PreferencesHolder.DB_LAST_UPDATE_KEY, 0);
         long currentTime = System.currentTimeMillis()/1000;
 
         //showNotification(notificationManager, notification_ID);
@@ -143,9 +143,9 @@ public class DBUpdateWorker extends Worker{
         Log.d(DEBUG_TAG, "Update finished successfully!");
         //update the version in the shared preference
         final SharedPreferences.Editor editor = shPr.edit();
-        editor.putInt(DatabaseUpdate.DB_VERSION_KEY, new_DB_version);
+        editor.putInt(PreferencesHolder.DB_GTT_VERSION_KEY, new_DB_version);
         currentTime = System.currentTimeMillis()/1000;
-        editor.putLong(DatabaseUpdate.DB_LAST_UPDATE_KEY, currentTime);
+        editor.putLong(PreferencesHolder.DB_LAST_UPDATE_KEY, currentTime);
         editor.apply();
         cancelNotification(notification_ID);
 
diff --git a/app/src/main/java/it/reyboz/bustorino/data/DatabaseUpdate.java b/app/src/main/java/it/reyboz/bustorino/data/DatabaseUpdate.java
index 4036afe..d5df45c 100644
--- a/app/src/main/java/it/reyboz/bustorino/data/DatabaseUpdate.java
+++ b/app/src/main/java/it/reyboz/bustorino/data/DatabaseUpdate.java
@@ -57,8 +57,7 @@ public class DatabaseUpdate {
     public static final int VERSION_UNAVAILABLE = -2;
     public static final int JSON_PARSING_ERROR = -4;
 
-    public static final String DB_VERSION_KEY = "NextGenDB.GTTVersion";
-    public static final String DB_LAST_UPDATE_KEY = "NextGenDB.LastDBUpdate";
+
 
 
     enum Result {
@@ -305,8 +304,8 @@ public class DatabaseUpdate {
                         .build())
                 .setInputData(reqData)
                 .build();
-        final int version = theShPr.getInt(DatabaseUpdate.DB_VERSION_KEY, -10);
-        final long lastDBUpdateTime = theShPr.getLong(DatabaseUpdate.DB_LAST_UPDATE_KEY, -10);
+        final int version = theShPr.getInt(PreferencesHolder.DB_GTT_VERSION_KEY, -10);
+        final long lastDBUpdateTime = theShPr.getLong(PreferencesHolder.DB_LAST_UPDATE_KEY, -10);
         if ((version >= 0 || lastDBUpdateTime >=0) && !restart)
             workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
                     ExistingPeriodicWorkPolicy.KEEP, wr);
diff --git a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java
index 9ccf2a0..ae3fb99 100644
--- a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java
+++ b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java
@@ -19,7 +19,6 @@ package it.reyboz.bustorino.data;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.Log;
 import it.reyboz.bustorino.R;
 
 import static android.content.Context.MODE_PRIVATE;
@@ -36,10 +35,11 @@ public abstract class PreferencesHolder {
 
     public static final String PREF_GTFS_DB_VERSION = "gtfs_db_version";
     public static final String PREF_INTRO_ACTIVITY_RUN ="pref_intro_activity_run";
-
+    public static final String DB_GTT_VERSION_KEY = "NextGenDB.GTTVersion";
+    public static final String DB_LAST_UPDATE_KEY = "NextGenDB.LastDBUpdate";
     public static final String PREF_FAVORITE_LINES = "pref_favorite_lines";
 
-    public static final Set<String> IGNORE_KEYS_LOAD = Set.of(PREF_GTFS_DB_VERSION, PREF_INTRO_ACTIVITY_RUN);
+    public static final Set<String> IGNORE_KEYS_LOAD_MAIN = Set.of(PREF_GTFS_DB_VERSION, PREF_INTRO_ACTIVITY_RUN, DB_GTT_VERSION_KEY, DB_LAST_UPDATE_KEY);
 
     public static SharedPreferences getMainSharedPreferences(Context context){
         return context.getSharedPreferences(context.getString(R.string.mainSharedPreferences), MODE_PRIVATE);
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/TestSavingFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/TestSavingFragment.kt
index 357a983..daf62c6 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/TestSavingFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/TestSavingFragment.kt
@@ -4,10 +4,12 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.CheckBox
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
@@ -17,11 +19,12 @@ import it.reyboz.bustorino.R
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.data.UserDB
 import it.reyboz.bustorino.util.Saving
-import java.io.BufferedOutputStream
-import java.io.ByteArrayInputStream
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
+import java.io.*
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
 
@@ -41,17 +44,26 @@ class TestSavingFragment : Fragment() {
             }
         }
 
-    private val openCSVFileLauncher =
+    private val openFileLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == Activity.RESULT_OK) {
+            if (!(loadFavorites|| loadPreferences)){
+                Toast.makeText(context, R.string.message_check_at_least_one, Toast.LENGTH_SHORT).show()
+            }
+            else if (result.resultCode == Activity.RESULT_OK) {
+
                 result.data?.data?.also { uri ->
-                    importCSVIntoFavorites(uri)
+
+                    loadZipData(uri,loadFavorites, loadPreferences)
                 }
             }
         }
 
 
     private lateinit var saveButton: Button
+    private var loadFavorites = true
+    private var loadPreferences = true
+    private lateinit var checkFavorites: CheckBox
+    private lateinit var checkPreferences: CheckBox
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -61,6 +73,8 @@ class TestSavingFragment : Fragment() {
         }*/
     }
 
+
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -72,18 +86,30 @@ class TestSavingFragment : Fragment() {
         saveButton.setOnClickListener {
             startFileSaveIntent()
         }
-        val readFavoritesButton = rootview.findViewById<Button>(R.id.readCSVButton)
+        checkFavorites = rootview.findViewById(R.id.favoritesCheckBox)
+        checkFavorites.setOnCheckedChangeListener { _, isChecked ->
+            loadFavorites = isChecked
+
+        }
+        checkPreferences = rootview.findViewById(R.id.preferencesCheckBox)
+        checkPreferences.setOnCheckedChangeListener { _, isChecked ->
+            loadPreferences = isChecked
+
+        }
+        val readFavoritesButton = rootview.findViewById<Button>(R.id.loadDataButton)
         readFavoritesButton.setOnClickListener {
             startOpenCSVIntent()
         }
 
+
         return rootview
     }
     private fun startFileSaveIntent() {
         val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
+            val day_string = getCurrentDateString()
             type = "application/zip" //"text/csv" // Set MIME type to CSV
-            putExtra(Intent.EXTRA_TITLE, "busto_data.zip") // Default file name
+            putExtra(Intent.EXTRA_TITLE, "busto_data_${day_string}.zip") // Default file name
             // Optionally, specify a URI for the directory that should be opened in
             // the system file picker before your app creates the document.
             //putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri)
@@ -114,6 +140,18 @@ class TestSavingFragment : Fragment() {
         }
     }
 
+    private fun readFileToString(zipInputStream: ZipInputStream): String{
+        val buffer = ByteArrayOutputStream()
+        val data = ByteArray(1024)
+        var count: Int
+        // Read the content of the specific entry into the buffer
+        while (zipInputStream.read(data, 0, data.size).also { count = it } != -1) {
+            buffer.write(data, 0, count)
+        }
+        // Convert the buffer's content to a string
+        return buffer.toString()
+    }
+
     private fun writeDataZip(uri: Uri){
         val context = context ?: return
         val contentResolver = context.contentResolver
@@ -122,19 +160,19 @@ class TestSavingFragment : Fragment() {
             val zipOutputStream = ZipOutputStream(bof)
 
             //write main preferences
-            zipOutputStream.putNextEntry(ZipEntry("preferences_main.json"))
+            zipOutputStream.putNextEntry(ZipEntry(MAIN_PREF_NAME))
             var sharedPrefs = PreferencesHolder.getMainSharedPreferences(context)
             var jsonPref = Saving.writeSharedPreferencesIntoJSON(sharedPrefs)
             writeStringToZipOS(jsonPref.toString(2), zipOutputStream)
             zipOutputStream.closeEntry()
 
-            zipOutputStream.putNextEntry(ZipEntry("preferences_app.json"))
+            zipOutputStream.putNextEntry(ZipEntry(APP_PREF_NAME))
             sharedPrefs = PreferencesHolder.getAppPreferences(context)
             jsonPref = Saving.writeSharedPreferencesIntoJSON(sharedPrefs)
             writeStringToZipOS(jsonPref.toString(2), zipOutputStream)
             zipOutputStream.closeEntry()
             //add CSV
-            zipOutputStream.putNextEntry(ZipEntry("favorites.csv"))
+            zipOutputStream.putNextEntry(ZipEntry(FAVORITES_NAME))
             val outWriter = OutputStreamWriter(zipOutputStream)
             val csvWriter = CsvWriter.builder().build(outWriter)
             val userDB = UserDB(context)
@@ -147,17 +185,71 @@ class TestSavingFragment : Fragment() {
             Toast.makeText(context, R.string.saved_data, Toast.LENGTH_SHORT).show()
         }
     }
+    private fun loadZipData(uri: Uri, loadFavorites: Boolean, loadPreferences: Boolean){
+        val context = context ?: return
+        val contentResolver = context.contentResolver
+        contentResolver.openInputStream(uri)?.use {ins->
+            ZipInputStream(ins).use {zipstream->
+                var entry: ZipEntry? = zipstream.nextEntry
+
+                while (entry != null) {
+                    Log.d("testSavingFragment", "read file: ${entry.name}")
+                    when (entry.name){
+                        FAVORITES_NAME -> if (loadFavorites) {
+
+                            val reader = InputStreamReader(zipstream)
+                            val csvReader = CsvReader.builder().build(reader)
+
+                            val userDB =  UserDB(context)
+                            val updated = userDB.insertRowsFromCSV(csvReader)
+
+                            userDB.close()
+                            //csvReader.close()
+                        }
+                        APP_PREF_NAME -> if(loadPreferences){
+                            val jsonString = readFileToString(zipstream)
+                            try {
+                                val pref = PreferencesHolder.getAppPreferences(context)
+                                Saving.importJsonToSharedPreferences(pref, jsonString, null, Regex("osmdroid\\."))
+                            } catch (e: Exception){
+                                Log.e(DEBUG_TAG, "Cannot read app preferences from file")
+                                e.printStackTrace()
+                            }
+                        }
+                        //Main preferences contains the lines favorites
+                        MAIN_PREF_NAME -> if(loadFavorites){
+                            val jsonString = readFileToString(zipstream)
+                            try {
+                                val pref = PreferencesHolder.getMainSharedPreferences(context)
+                                //In the future, if we move the favorite lines to a different file,
+                                // We should check here if the key is in the jsonObject, and copy it to the other file
+                                Saving.importJsonToSharedPreferences(pref, jsonString, PreferencesHolder.IGNORE_KEYS_LOAD_MAIN, null)
+                            } catch (e: Exception){
+                                Log.e(DEBUG_TAG, "Cannot read main preferences from file")
+                                e.printStackTrace()
+                            }
+                        }
+                    }
+                    //load new entry
+                    entry = zipstream.nextEntry
+                }
+
+            }
+            Toast.makeText(context, R.string.data_imported_backup, Toast.LENGTH_SHORT).show()
+        }
+
+    }
 
     ///OPEN CSV
     private fun startOpenCSVIntent(){
         val intent= Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
-            type = "text/*" // Set MIME type
+            type = "application/zip" // Set MIME type
             // Optionally, specify a URI for the directory that should be opened in
             // the system file picker before your app creates the document.
             //putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri)
         }
-        openCSVFileLauncher.launch(intent)
+        openFileLauncher.launch(intent)
     }
 
     private fun importCSVIntoFavorites(uri: Uri){
@@ -179,6 +271,11 @@ class TestSavingFragment : Fragment() {
     companion object {
 
         const val FILE_SAVE = "favorites.csv"
+        const val DEBUG_TAG ="BusTO-TestSave"
+
+        const val FAVORITES_NAME = "favorites.csv"
+        const val MAIN_PREF_NAME = "preferences_main.json"
+        const val APP_PREF_NAME = "preferences_app.json"
 
         @JvmStatic
         fun newInstance() =
@@ -190,5 +287,11 @@ class TestSavingFragment : Fragment() {
                 */
             }
 
+        fun getCurrentDateString(): String{
+
+            val dateFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.ITALY)
+            val date = Date()
+            return  dateFormat.format(date)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/util/Saving.kt b/app/src/main/java/it/reyboz/bustorino/util/Saving.kt
index 2c7acca..6eb7ca6 100644
--- a/app/src/main/java/it/reyboz/bustorino/util/Saving.kt
+++ b/app/src/main/java/it/reyboz/bustorino/util/Saving.kt
@@ -90,7 +90,7 @@ class Saving {
 
 
         fun importJsonToSharedPreferences(sharedPreferences: SharedPreferences,
-                                          allJsonAsString: String, ignoreKeys: Set<String>): Int {
+                                          allJsonAsString: String, ignoreKeys: Set<String>?, ignoreKeyRegex: Regex?): Int {
             // Parse JSON
             val jsonObject = JSONObject(allJsonAsString)
 
@@ -99,7 +99,7 @@ class Saving {
                 // Write to SharedPreferences
                 val editor = sharedPreferences.edit()
                 jsonObject.keys().forEach { key ->
-                    if (ignoreKeys.contains(key))
+                    if (ignoreKeys?.contains(key)==true || ignoreKeyRegex?.containsMatchIn(key)==true)
                         //do nothing
                         return@forEach
                     val value = jsonObject.opt(key)
diff --git a/app/src/main/res/layout/fragment_test_saving.xml b/app/src/main/res/layout/fragment_test_saving.xml
index c035b83..654aded 100644
--- a/app/src/main/res/layout/fragment_test_saving.xml
+++ b/app/src/main/res/layout/fragment_test_saving.xml
@@ -9,16 +9,55 @@
             android:layout_height="match_parent">
 
         <Button
-                android:text="Save file"
+                android:text="@string/btn_backup_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/saveButton"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="50dp"/>
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/favoritesCheckBox"
+                android:layout_marginTop="50dp"
+                android:layout_marginBottom="50dp"
+                app:layout_constraintVertical_bias="0.0"
+                app:layout_constraintVertical_chainStyle="packed"
+
+        />
+
+
+        <CheckBox
+                android:text="@string/load_file_favorites"
+                android:layout_width="wrap_content"
+                android:checked="true"
+                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/saveButton"
+                app:layout_constraintBottom_toTopOf="@id/preferencesCheckBox"
+                app:layout_constraintVertical_bias="0.0"
+                android:minHeight="48dp"
+
+                android:layout_height="wrap_content" android:id="@+id/favoritesCheckBox"/>
+        <CheckBox
+                android:text="@string/load_preferences"
+                android:layout_width="wrap_content"
+                android:checked="true"
+                app:layout_constraintTop_toBottomOf="@id/favoritesCheckBox"
+                app:layout_constraintBottom_toTopOf="@id/loadDataButton"
+                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                android:minHeight="48dp"
+                android:layout_marginTop="8dp"
+
+                android:layout_height="wrap_content" android:id="@+id/preferencesCheckBox"/>
         <Button
-                android:text="Import favorites from file"
+                android:text="@string/btn_load_backup_message"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/readCSVButton"
+                android:layout_height="wrap_content" android:id="@+id/loadDataButton"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/saveButton" android:layout_marginTop="50dp"/>
+                app:layout_constraintTop_toBottomOf="@id/preferencesCheckBox"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginTop="18dp"
+                app:layout_constraintVertical_bias="0.0"
+
+
+        />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5131ac6..2f93c4e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -276,6 +276,13 @@ Guarda nelle <b>Impostazioni</b> per personalizzare l\'app come preferisci, e su
     <string name="notification_permission_granted">Notifiche abilitate</string>
 
     <string name="saved_data">Dati salvati</string>
+    <string name="btn_backup_message">Salva backup</string>
+    <string name="btn_load_backup_message">Importa i dati dal backup</string>
+    <string name="data_imported_backup">Backup importato</string>
+
+    <string name="message_check_at_least_one">Seleziona almeno un elemento da importare!</string>
+    <string name="load_file_favorites">Importa preferiti dal backup</string>
+    <string name="load_preferences">Importa preferenze dal backup</string>
 
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25a7a14..e72e5f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -306,5 +306,11 @@ Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About
     <string name="notification_permission_granted">Notifications enabled</string>
 
     <string name="saved_data">Data saved</string>
+    <string name="btn_backup_message">Backup to file</string>
+    <string name="btn_load_backup_message">Import data from backup</string>
+    <string name="data_imported_backup">Backup has been imported</string>
+    <string name="message_check_at_least_one">Check at least one item to import!</string>
+    <string name="load_file_favorites">Import favorites from backup</string>
+    <string name="load_preferences">Import preferences from backup</string>
 
 </resources>