From 0e05767cce4d1fda9babdfa10b959018762cbd03 Mon Sep 17 00:00:00 2001
From: Sam LaChance <sam.lachance@outlook.com>
Date: Mon, 29 Aug 2022 21:29:43 -0400
Subject: [PATCH 01/52] Fixing a visual glitch in the Home dropdown menu. The
 highlighting when tapping an item wasn't working correctly.

---
 app/src/main/java/com/eveningoutpost/dexdrip/Home.java | 1 -
 app/src/main/res/layout/activity_home.xml              | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
index fbbd88104f..199550e66a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -400,7 +400,6 @@ protected void onCreate(Bundle savedInstanceState) {
             binding.setHome(home);
             homeShelf.set("arrow_configurator", false);
             dialog.setContentView(binding.getRoot());
-            dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             dialog.show();
             return false;
         });
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 846f08c160..c06eeeaf02 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -48,10 +48,8 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/my_toolbar"
                 android:layout_width="match_parent"
-
                 android:layout_height="wrap_content"
-                android:minHeight="?attr/actionBarSize"
-                app:theme="@style/Toolbar" />
+                android:minHeight="?attr/actionBarSize" />
 
             <RelativeLayout
                 android:id="@+id/home_layout_holder"

From 98f4cc493110bae88e27333c47b703ed836d9995 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:22:57 +0100
Subject: [PATCH 02/52] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings-fr.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-fr/strings-fr.xml b/app/src/main/res/values-fr/strings-fr.xml
index cb24e4834c..c330a93e0a 100644
--- a/app/src/main/res/values-fr/strings-fr.xml
+++ b/app/src/main/res/values-fr/strings-fr.xml
@@ -1574,8 +1574,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Ne plus me le demander</string>
     <string name="enable_streaming_dialog_text">Voulez-vous connecter xDrip à ce capteur? Cela empêchera le lecteur Freestyle et l\'application LibreLink de recevoir les alertes. Appuyez sur oui et scannez vous à nouveau pour vous connecter (choisissez de ne pas vous connecter si vous voulez exécuter xDrip avec l\'application patchée)</string>
     <string name="enable_streaming_dialog_title">Connexion du capteur Libre au Bluetooth</string>
-    <string name="title_lower_fuzzer">Réduire FUZZER</string>
-    <string name="summary_lower_fuzzer">Réduire la valeur de FUZZER de 2,5 minutes à 37,5 secondes</string>
     <string name="without_camera_permission_cannot_scan_barcode">Impossible de scanner le code-barres sans la permission caméra</string>
     <string name="summary_create_missing_filtered">Rendre les données filtrées si nécessaire</string>
     <string name="title_create_missing_filtered">Créer les filtrées manquantes</string>

From ef6dbb39ad4fdc3ebdadc96e62119a0f3c00e289 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:22:58 +0100
Subject: [PATCH 03/52] New translations strings.xml (Dutch)

---
 app/src/main/res/values-nl/strings-nl.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-nl/strings-nl.xml b/app/src/main/res/values-nl/strings-nl.xml
index 505df57ef2..217f2326a6 100644
--- a/app/src/main/res/values-nl/strings-nl.xml
+++ b/app/src/main/res/values-nl/strings-nl.xml
@@ -1568,8 +1568,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Vraag me dat niet nog een keer</string>
     <string name="enable_streaming_dialog_text">Wil je xDrip met deze sensor verbinden? Dit zorgt ervoor dat de libre reader en libre link geen waarschuwingen meer ontvangen. Druk op Ja en scan opnieuw om verbinding te maken (kies geen verbinding als u xDrip wilt uitvoeren met de gepatchte app)</string>
     <string name="enable_streaming_dialog_title">Libre-sensor verbinden met bluetooth</string>
-    <string name="title_lower_fuzzer">Verlaag FUZZER</string>
-    <string name="summary_lower_fuzzer">Verlaag de FUZZER waarde van 2.5 minuten naar 37.5 seconden</string>
     <string name="without_camera_permission_cannot_scan_barcode">Zonder camera toestemming kan er geen barcode gescand worden</string>
     <string name="summary_create_missing_filtered">Maak gefilterde gegevens indien nodig</string>
     <string name="title_create_missing_filtered">Ontbrekende gefilterde maken</string>

From 826e13444802266ced63a0db50a08564afd6283d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:04 +0100
Subject: [PATCH 04/52] New translations strings.xml (Turkish)

---
 app/src/main/res/values-tr/strings-tr.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-tr/strings-tr.xml b/app/src/main/res/values-tr/strings-tr.xml
index 8cdb5d4158..b9aac8cd8f 100644
--- a/app/src/main/res/values-tr/strings-tr.xml
+++ b/app/src/main/res/values-tr/strings-tr.xml
@@ -1573,8 +1573,6 @@
     <string name="enable_streaming_dialog_dont_ask_again"> Bunu bir daha sorma</string>
     <string name="enable_streaming_dialog_text">Bu sensörle xDrip\'i bağlamak istiyor musunuz? Bu, Libre okuyucunun ve LibreLink\'in uyarı almasını durduracaktır. Evet\'e basın ve bağlanmak için tekrar tarayın (xDrip\'i yamalı uygulamayla çalıştırmak istiyorsanız bağlanmayın)</string>
     <string name="enable_streaming_dialog_title">Libre sensörü Bluetooth\'a bağlama</string>
-    <string name="title_lower_fuzzer">Düşük FUZZER</string>
-    <string name="summary_lower_fuzzer">FUZZER değerini 2,5 dakikadan 37,5 saniyeye düşürün</string>
     <string name="without_camera_permission_cannot_scan_barcode">Kamera izni olmadan barkod okunamaz</string>
     <string name="summary_create_missing_filtered">Gerektiğinde filtrelenmiş veriler yapın</string>
     <string name="title_create_missing_filtered">Eksik okuma filtresi oluştur</string>
@@ -1666,5 +1664,8 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Düzensizlikleri yumuşatarak grafikleri basitleştirin</string>
     <string name="graph_smoothing">Grafik Yumuşatma</string>
     <string name="last_reading">Son Okuma Değeri</string>
+    <string name="select_file_for_alert">Uyarı için Dosya Seçin</string>
     <string name="cannot_choose_file_without_permission">Depolama izni olmadan dosya seçilemiyor</string>
+    <string name="select_time">Saati Seçin</string>
+    <string name="select_tone_for_alerts">Uyarılar için ton seçin</string>
 </resources>

From 59c99ca5b038cd3479ac452eac584b8b59e37413 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:10 +0100
Subject: [PATCH 05/52] New translations strings.xml (Russian)

---
 app/src/main/res/values-ru/strings-ru.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-ru/strings-ru.xml b/app/src/main/res/values-ru/strings-ru.xml
index a2ae888517..dd8c162a9d 100644
--- a/app/src/main/res/values-ru/strings-ru.xml
+++ b/app/src/main/res/values-ru/strings-ru.xml
@@ -1573,8 +1573,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Больше не спрашивать</string>
     <string name="enable_streaming_dialog_text">Вы хотите подключить xDrip к этому датчику? Данное действие сделает невозможным получение сигналов тревоги на ридере и в приложении LibreLink. Нажмите \"да\" и просканируйте датчик еще раз, чтобы создать подключение (выберите \"не подключать\", если планируете использовать xDrip с \"пропатченным\" приложением LibreLink)</string>
     <string name="enable_streaming_dialog_title">Подключение датчика Libre к Bluetooth</string>
-    <string name="title_lower_fuzzer">Уменьшить FUZZER</string>
-    <string name="summary_lower_fuzzer">Уменьшить значение Fuzzer с 2,5 минуты до 37,5 секунды</string>
     <string name="without_camera_permission_cannot_scan_barcode">Без разрешения на камеру мы не можем сканировать штрихкод</string>
     <string name="summary_create_missing_filtered">По мере необходимости давать отфильтрованные данные</string>
     <string name="title_create_missing_filtered">Восстанавливать пропущенные фильтрованные данные</string>

From 2a3ec1bcfdb1cc4a63e92295abeae4f7969ce218 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:11 +0100
Subject: [PATCH 06/52] New translations strings.xml (Portuguese)

---
 app/src/main/res/values-pt/strings-pt.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt/strings-pt.xml b/app/src/main/res/values-pt/strings-pt.xml
index 1d8acd6e17..fcd2e32e92 100644
--- a/app/src/main/res/values-pt/strings-pt.xml
+++ b/app/src/main/res/values-pt/strings-pt.xml
@@ -1574,8 +1574,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Não voltar a perguntar</string>
     <string name="enable_streaming_dialog_text">Deseja ligar o xDrip com este sensor?  Isto impedirá o leitor do Libre e app LibreLink de receber alertas. Pressione sim e faça leitura por NFC novamente para ligar (escolha não ligar se quiser executar o xDrip com a Libre 2 Patched app)</string>
     <string name="enable_streaming_dialog_title">A ligar o sensor Libre ao bluetooth</string>
-    <string name="title_lower_fuzzer">FUZZER baixo</string>
-    <string name="summary_lower_fuzzer">Diminuir o valor do FUZER de 2,5 minutos para 37,5 segundos</string>
     <string name="without_camera_permission_cannot_scan_barcode">Sem permissão de câmara não podemos digitalizar um código de barras</string>
     <string name="summary_create_missing_filtered">Criar dados filtrados conforme necessário</string>
     <string name="title_create_missing_filtered">Criar valores em falta</string>
@@ -1667,5 +1665,8 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Simplifique os gráficos facilitando irregularidades</string>
     <string name="graph_smoothing">Suavização do gráfico</string>
     <string name="last_reading">Última Leitura</string>
-    <string name="cannot_choose_file_without_permission">Não pode seleccionar ficheiro sem permissão de armazenamento</string>
+    <string name="select_file_for_alert">Selecione o ficheiro de alerta</string>
+    <string name="cannot_choose_file_without_permission">Não pode selecionar ficheiro sem permissão de armazenamento</string>
+    <string name="select_time">Seleccione a hora</string>
+    <string name="select_tone_for_alerts">Selecione o tom para alertas</string>
 </resources>

From 828bad5f86b7f8bbf88417ad21dceee10af28df4 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:14 +0100
Subject: [PATCH 07/52] New translations strings.xml (Estonian)

---
 app/src/main/res/values-et/strings-et.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-et/strings-et.xml b/app/src/main/res/values-et/strings-et.xml
index 1308443249..467357e832 100644
--- a/app/src/main/res/values-et/strings-et.xml
+++ b/app/src/main/res/values-et/strings-et.xml
@@ -1574,8 +1574,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Ära küsi seda enam uuesti</string>
     <string name="enable_streaming_dialog_text">Kas soovid ühendada xDrip\'i selle sensoriga? See ei lase Libre lugejal ja LibreLink\'il hoiatusi saada. Vajuta \"JAH\" ja skaneeri uuesti ühenduse loomiseks (vali \"ÄRA ÜHENDA\", kui soovid käivitada xDrip\'i muudetud rakendusega)</string>
     <string name="enable_streaming_dialog_title">Libre sensori ühendamine Bluetooth\'iga</string>
-    <string name="title_lower_fuzzer">Vähenda FUZZER\'it</string>
-    <string name="summary_lower_fuzzer">Vähenda FUZZER\'i väärtust 2.5 minutilt 37.5 sekundile</string>
     <string name="without_camera_permission_cannot_scan_barcode">Ilma kaamera loata ei saa me vöötkoodi skaneerida</string>
     <string name="summary_create_missing_filtered">Vajadusel tee filtreeritud andmeid</string>
     <string name="title_create_missing_filtered">Loo puuduolevad väärtused</string>
@@ -1667,5 +1665,8 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Lihtsusta graafikuid, siludes ebakorrapärasusi</string>
     <string name="graph_smoothing">Graafiku silumine</string>
     <string name="last_reading">Viimane näit</string>
+    <string name="select_file_for_alert">Vali fail Alarmi jaoks</string>
     <string name="cannot_choose_file_without_permission">Ilma salvestamise loata ei saa faili valida</string>
+    <string name="select_time">Vali aeg</string>
+    <string name="select_tone_for_alerts">Vali helin alarmi jaoks</string>
 </resources>

From 8e159de045d69c591d3f1187a1e2a79dc3b09a45 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:17 +0100
Subject: [PATCH 08/52] New translations strings.xml (Italian)

---
 app/src/main/res/values-it/strings-it.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-it/strings-it.xml b/app/src/main/res/values-it/strings-it.xml
index 3aa4762235..3e442a52e1 100644
--- a/app/src/main/res/values-it/strings-it.xml
+++ b/app/src/main/res/values-it/strings-it.xml
@@ -1574,8 +1574,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Non chiedermelo più</string>
     <string name="enable_streaming_dialog_text">Vuoi collegare xDrip con questo sensore? Questo impedirà al lettore Libre e a LibreLink di ricevere allarmi. Premi sì e scansiona di nuovo per connetterti (scegli non connetterti se vuoi eseguire xDrip con l\'app patchata)</string>
     <string name="enable_streaming_dialog_title">Connessione del sensore Libre al bluetooth</string>
-    <string name="title_lower_fuzzer">Abbassa FUZZER</string>
-    <string name="summary_lower_fuzzer">Abbassa il valore FUZZER da 2,5 minuti a 37,5 secondi</string>
     <string name="without_camera_permission_cannot_scan_barcode">Senza il permesso di accesso alla fotocamera non si può scansionare un codice a barre</string>
     <string name="summary_create_missing_filtered">Crea i dati filtrati se necessario</string>
     <string name="title_create_missing_filtered">Crea dati filtrati mancanti</string>

From 7f64dbcb8be9f960bcbdaeb6bc6a582dd3aaa94d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:18 +0100
Subject: [PATCH 09/52] New translations strings.xml (Hungarian)

---
 app/src/main/res/values-hu/strings-hu.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-hu/strings-hu.xml b/app/src/main/res/values-hu/strings-hu.xml
index 63b25f0028..fbf1967d75 100644
--- a/app/src/main/res/values-hu/strings-hu.xml
+++ b/app/src/main/res/values-hu/strings-hu.xml
@@ -1547,8 +1547,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Ne kérdezzen rá többet</string>
     <string name="enable_streaming_dialog_text">Összekapcsolja az xDripet ezzel a szenzorral? Ezután a Libre olvasó és a LibreLink app nem kap riasztást. Nyomja meg az Igen gombot, olvassa le a szenzort a kapcsolódáshoz (Ha a patch-elt LibreLink-et akarja használni, ne kapcsolja össze őket.)</string>
     <string name="enable_streaming_dialog_title">Csatlakozzon Libre szenzorhoz BT-szal</string>
-    <string name="title_lower_fuzzer">FUZZER csökkentése</string>
-    <string name="summary_lower_fuzzer">A FUZZER értékének csökkentése 2,5 percről 37,5 mp-re</string>
     <string name="without_camera_permission_cannot_scan_barcode">Kamerahasználat engedélyezése nélkül nem működik a vonalkód olvasás</string>
     <string name="title_create_missing_filtered">Alkossa meg a hiányzó szűrt adatokat</string>
     <string name="summary_widget_hide_graph">A grafikon elrejtése a widgeteken (a következő olvasáskor jelenik meg)</string>

From f1b4faed09b7ecb35842885a4019218558106015 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:22 +0100
Subject: [PATCH 10/52] New translations strings.xml (German)

---
 app/src/main/res/values-de/strings-de.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings-de.xml b/app/src/main/res/values-de/strings-de.xml
index 6980424d8d..a601543e94 100644
--- a/app/src/main/res/values-de/strings-de.xml
+++ b/app/src/main/res/values-de/strings-de.xml
@@ -1553,7 +1553,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Nicht erneut fragen</string>
     <string name="enable_streaming_dialog_text">Möchtest du xDrip mit diesem Sensor verbinden? Das Libre Lesegerät und die LibreLink App werden dann keine Alarme mehr empfangen. Drücke \"Ja\" und scanne erneut für eine Verbindung (wähle \"nicht verbinden\", wenn du xDrip mit der gepatchten Libre App nutzen möchtest)</string>
     <string name="enable_streaming_dialog_title">Verbinde Libre-Sensor mit Bluetooth</string>
-    <string name="summary_lower_fuzzer">Verringere den FUZZER Wert von 2,5 Minuten auf 37,5 Sekunden</string>
     <string name="without_camera_permission_cannot_scan_barcode">Ohne Kamera-Berechtigung können wir keinen Barcode scannen</string>
     <string name="summary_widget_hide_graph">Graph auf Widgets ausblenden (wird beim nächsten Wert aktiv)</string>
     <string name="title_widget_hide_graph">Graph auf Widgets ausblenden</string>

From 012a94ff2d672eec7af6500e96652ef623fd02df Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:24 +0100
Subject: [PATCH 11/52] New translations strings.xml (Bulgarian)

---
 app/src/main/res/values-bg/strings-bg.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-bg/strings-bg.xml b/app/src/main/res/values-bg/strings-bg.xml
index 5dc8e79b7b..cead12f3e3 100644
--- a/app/src/main/res/values-bg/strings-bg.xml
+++ b/app/src/main/res/values-bg/strings-bg.xml
@@ -423,8 +423,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">Не ме питай повече</string>
     <string name="enable_streaming_dialog_text">Искате ли да свържите xDrip с този сензор? Това ще преустанови Libre четецът и LibreLink приложението да получават аларми. Натисни да и сканиране отново за да се свържеш (избери не се свързвай, ако искате да свъжите xDrip с кракнатата аппликация на Patched Libre app)</string>
     <string name="enable_streaming_dialog_title">Свържи Libre сонзор към Bluetooth</string>
-    <string name="title_lower_fuzzer">Намалете стойността на FUZZER</string>
-    <string name="summary_lower_fuzzer">Намалете стойността на FUZZER от 2,5 минути на 37,5 секунди</string>
     <string name="title_widget_hide_graph">Скрии графиката на Widget-а</string>
     <string name="summary_illustrate_remote_data">Покажи данни получени отдаличено (само за диагностика)</string>
     <string name="title_illustrate_remote_data">Визуализирай отдаличени данни</string>

From 41911e0c3b12937bd9a51a0c893148d02e861ab2 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:26 +0100
Subject: [PATCH 12/52] New translations strings.xml (Spanish)

---
 app/src/main/res/values-es/strings-es.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-es/strings-es.xml b/app/src/main/res/values-es/strings-es.xml
index 8a0f887685..38bb82d41f 100644
--- a/app/src/main/res/values-es/strings-es.xml
+++ b/app/src/main/res/values-es/strings-es.xml
@@ -1574,8 +1574,6 @@
     <string name="enable_streaming_dialog_dont_ask_again">No volver a preguntarme</string>
     <string name="enable_streaming_dialog_text">¿Quieres conectar xDrip con este sensor? Esto provocará que el lector Libre y LibreLink dejen de recibir alertas. Pulsa sí y escanea de nuevo para conectar (elige no conectar si quieres ejecutar xDrip con la aplicación modificada)</string>
     <string name="enable_streaming_dialog_title">Conectando sensor Libre a Bluetooth</string>
-    <string name="title_lower_fuzzer">Baja FUZZER</string>
-    <string name="summary_lower_fuzzer">Bajar el valor de FUZZER de 2.5 minutos a 37.5 segundos</string>
     <string name="without_camera_permission_cannot_scan_barcode">Sin el permiso de usar la cámara, no podemos escanear un código de barras</string>
     <string name="summary_create_missing_filtered">Make filtered data as needed</string>
     <string name="title_create_missing_filtered">Crear filtros faltantes</string>

From 5e812abec779f339d3243deb993ac9b3e03a95ce Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:23:29 +0100
Subject: [PATCH 13/52] New translations strings.xml (Polish)

---
 app/src/main/res/values-pl/strings-pl.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-pl/strings-pl.xml b/app/src/main/res/values-pl/strings-pl.xml
index 648eb5ef2f..37ba0b202e 100644
--- a/app/src/main/res/values-pl/strings-pl.xml
+++ b/app/src/main/res/values-pl/strings-pl.xml
@@ -1572,5 +1572,8 @@
     <string name="please_update_OOP2_or_move_to_calibrate_based_on_raw_mode">proszę zaktualizuj OOP2 albo wybierz kalibrację w oparciu o dane surowe</string>
     <string name="graph_smoothing">Wygładzanie wykresu</string>
     <string name="last_reading">Ostatni odczyt</string>
+    <string name="select_file_for_alert">Wybierz plik dla alarmu</string>
     <string name="cannot_choose_file_without_permission">Nie można wybrać pliku bez uprawnień do przechowywania</string>
+    <string name="select_time">Wybierz Czas</string>
+    <string name="select_tone_for_alerts">Wybierz dźwięk dla alarmów</string>
 </resources>

From b9bfde379db47e7cd901e027d6e4ef05c10096a8 Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Sat, 3 Sep 2022 00:21:36 -0400
Subject: [PATCH 14/52] Remove debug smoothing from engineering mode

---
 .../eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java   | 2 +-
 app/src/main/res/xml/pref_advanced_settings.xml                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
index 08dbb125e6..5c4d6fe306 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java
@@ -1077,7 +1077,7 @@ private synchronized void addBgReadingValues(final boolean simple) {
             smbValues.clear();
 
             if (Pref.getBooleanDefaultFalse("graph_smoothing")) {
-                if (Home.get_engineering_mode() && Pref.getBooleanDefaultFalse("show-unsmoothed-values-as-plugin")) {
+                if (Pref.getBooleanDefaultFalse("show-unsmoothed-values-as-plugin")) {
                     showUnSmoothedValues(bgReadings);
                 }
                 SmootherFactory.get(Pref.getString("main-chart-smoothing-alg","")).smoothBgReadings(bgReadings);
diff --git a/app/src/main/res/xml/pref_advanced_settings.xml b/app/src/main/res/xml/pref_advanced_settings.xml
index aa78c26feb..743b3338ae 100644
--- a/app/src/main/res/xml/pref_advanced_settings.xml
+++ b/app/src/main/res/xml/pref_advanced_settings.xml
@@ -1479,8 +1479,7 @@
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="show-unsmoothed-values-as-plugin"
-                    android:dependency="engineering_mode"
-                    android:summary="Show unsmoothed data in place of plugin (engineering mode only)"
+                    android:summary="Show unsmoothed data as well"
                     android:title="Debug smoothing" />
                 <CheckBoxPreference
                     android:defaultValue="true"

From e9e6cb92db196fde3a67a19a9444490cdbd0351d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sat, 3 Sep 2022 10:25:17 +0100
Subject: [PATCH 15/52] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings-fr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings-fr.xml b/app/src/main/res/values-fr/strings-fr.xml
index c330a93e0a..c85e14867b 100644
--- a/app/src/main/res/values-fr/strings-fr.xml
+++ b/app/src/main/res/values-fr/strings-fr.xml
@@ -1666,7 +1666,7 @@
     <string name="graph_smoothing">Lissage du graphique</string>
     <string name="last_reading">Dernière lecture</string>
     <string name="select_file_for_alert">Sélectionner le son pour l\'alerte</string>
-    <string name="cannot_choose_file_without_permission">Impossible de choisir un fichier sans avoir l\'autorisation de stockage</string>
+    <string name="cannot_choose_file_without_permission">Impossible de choisir le fichier sans l\'autorisation de stockage</string>
     <string name="select_time">Sélectionner l\'horaire</string>
     <string name="select_tone_for_alerts">Sélectionner le son pour les alertes</string>
 </resources>

From 8d1a7ea5247faa043c846a549d0caa01370457d2 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sat, 3 Sep 2022 10:25:18 +0100
Subject: [PATCH 16/52] New translations strings.xml (Italian)

---
 app/src/main/res/values-it/strings-it.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-it/strings-it.xml b/app/src/main/res/values-it/strings-it.xml
index 3e442a52e1..1dcbea460f 100644
--- a/app/src/main/res/values-it/strings-it.xml
+++ b/app/src/main/res/values-it/strings-it.xml
@@ -1665,5 +1665,8 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Semplifica i grafici lisciando le irregolarità</string>
     <string name="graph_smoothing">Lisciamento del Grafico</string>
     <string name="last_reading">Ultima lettura</string>
+    <string name="select_file_for_alert">Seleziona Suoneria Allarme</string>
     <string name="cannot_choose_file_without_permission">Impossibile scegliere il file senza i permessi di accesso alla memoria</string>
+    <string name="select_time">Seleziona Orario</string>
+    <string name="select_tone_for_alerts">Seleziona Tono Allarme</string>
 </resources>

From c1b685065c8600a76c079eb028050a2c107309eb Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Sat, 3 Sep 2022 21:41:31 -0400
Subject: [PATCH 17/52] Updated show unsmooted title and summary

---
 app/src/main/res/values/strings.xml             | 2 ++
 app/src/main/res/xml/pref_advanced_settings.xml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7d8335ce2..5192a5b70d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1717,4 +1717,6 @@
     <string name="cannot_choose_file_without_permission">Cannot choose file without storage permission</string>
     <string name="select_time">Select Time</string>
     <string name="select_tone_for_alerts">Select tone for Alerts</string>
+    <string name="show_unsmoothed">Show unsmoothed</string>
+    <string name="show_unsmoothed_summary">Show unsmoothed data also if Graph Smoothing is enabled. If calibration plugin is used, will show unsmoothed data instead of plugin data.</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_advanced_settings.xml b/app/src/main/res/xml/pref_advanced_settings.xml
index 743b3338ae..2c3a354416 100644
--- a/app/src/main/res/xml/pref_advanced_settings.xml
+++ b/app/src/main/res/xml/pref_advanced_settings.xml
@@ -1479,8 +1479,8 @@
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="show-unsmoothed-values-as-plugin"
-                    android:summary="Show unsmoothed data as well"
-                    android:title="Debug smoothing" />
+                    android:summary="@string/show_unsmoothed_summary"
+                    android:title="@string/show_unsmoothed" />
                 <CheckBoxPreference
                     android:defaultValue="true"
                     android:dependency="engineering_mode"

From 2500856097b1e8bd3f70ec01114a5a44e93d77b9 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:32:41 +0100
Subject: [PATCH 18/52] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings-fr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings-fr.xml b/app/src/main/res/values-fr/strings-fr.xml
index c85e14867b..37def6ecb6 100644
--- a/app/src/main/res/values-fr/strings-fr.xml
+++ b/app/src/main/res/values-fr/strings-fr.xml
@@ -352,7 +352,7 @@
     <string name="download_now">Télécharger maintenant</string>
     <string name="automatically_check_for_updates">Vérifier automatiquement les mises à jour</string>
     <string name="here_you_can_save_the_settings_to_the_external_storage_sdcard">Ici, vous pouvez enregistrer les paramètres vers la mémoire interne (Download/xDrip-export/com.eveningoutpost.dexdrip_preferences.xml).\n\nUne fois enregistrés dans le fichier, il est possible pour toute application de lire les paramètres qui pourraient contenir des informations sensibles.\n\nIl est conseillé de supprimer les paramètres une fois que vous les avez importés à nouveau si vous êtes préoccupé par cela.</string>
-    <string name="save_all_settings_to_sdcard">Enregistrer tous les paramètres à partir du fichier</string>
+    <string name="save_all_settings_to_sdcard">Enregistrer tous les paramètres dans le fichier</string>
     <string name="load_all_settings_from_sdcard">Charger tous les paramètres depuis le fichier</string>
     <string name="delete_any_settings_on_sdcard">Supprimer le dossier de paramètres (Download/xDrip-export)</string>
     <string name="use_qr_codes_to_transfer_settings_using_settings_auto_configure_feature"><![CDATA[Utilisez les codes QR pour transférer les paramètres en utilisant Paramètres-> Configuration Automatique]]></string>

From 64245e07fd232d7dc967f4e523bade5e0a08d9e1 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Tue, 6 Sep 2022 10:45:37 +0100
Subject: [PATCH 19/52] New translations strings.xml (Hungarian)

---
 app/src/main/res/values-hu/strings-hu.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-hu/strings-hu.xml b/app/src/main/res/values-hu/strings-hu.xml
index fbf1967d75..395af835ed 100644
--- a/app/src/main/res/values-hu/strings-hu.xml
+++ b/app/src/main/res/values-hu/strings-hu.xml
@@ -1601,6 +1601,8 @@
     <string name="basal_profile_editor">Bázisinzulin-profil szerkesztő</string>
     <string name="import_sounds">Hangok importálása</string>
     <string name="play_sounds_when_importing">Hangjelzés fontos adatok pl. profilok importálásakor</string>
+    <string name="show_action_buttons_within_alerts">Műveleti gombok megjelenítése (pl. szundi) a riasztási értesítésekben</string>
+    <string name="alert_buttons">Riasztás gombok</string>
     <string name="show_sensor_expiry">Szenzor lejárat mutatása</string>
     <string name="show_collector_status">Kollektor állapot muitatása</string>
     <string name="show_chart_preview">Grafikon előnézet mutatása</string>
@@ -1613,5 +1615,8 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">A grafikon egyszerűsítése a kiugró értékek elsimításával</string>
     <string name="graph_smoothing">Grafikon simítása</string>
     <string name="last_reading">Utolsó leolvasás</string>
+    <string name="select_file_for_alert">Válassza ki a riasztás fájlját</string>
     <string name="cannot_choose_file_without_permission">Tárhelyengedély nélkül nem nyithat meg fájlokat</string>
+    <string name="select_time">Időpont kiválasztása</string>
+    <string name="select_tone_for_alerts">Válassza ki a riasztás hangját</string>
 </resources>

From c5132ef189bfa1bc603e266fe7a6378cbebdd9f6 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Tue, 6 Sep 2022 11:46:21 +0000
Subject: [PATCH 20/52] Settings: follower save power default true

---
 app/src/main/res/xml/xdrip_plus_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/xml/xdrip_plus_prefs.xml b/app/src/main/res/xml/xdrip_plus_prefs.xml
index 8a92bcc25a..f36a0e58fd 100644
--- a/app/src/main/res/xml/xdrip_plus_prefs.xml
+++ b/app/src/main/res/xml/xdrip_plus_prefs.xml
@@ -798,7 +798,7 @@
                 android:summary="@string/summary_plus_accept_follower_actions"
                 android:title="@string/title_plus_accept_follower_actions" />
             <CheckBoxPreference
-                android:defaultValue="false"
+                android:defaultValue="true"
                 android:key="plus_follower_save_power"
                 android:summary="@string/reduce_battery_and_network_overhead"
                 android:title="@string/save_power" />

From eb5bcabc88f97c2cb5e6628a1cd2a4613a625f25 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:26 +0100
Subject: [PATCH 21/52] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings-fr.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-fr/strings-fr.xml b/app/src/main/res/values-fr/strings-fr.xml
index 37def6ecb6..f6139c21c0 100644
--- a/app/src/main/res/values-fr/strings-fr.xml
+++ b/app/src/main/res/values-fr/strings-fr.xml
@@ -1669,4 +1669,6 @@
     <string name="cannot_choose_file_without_permission">Impossible de choisir le fichier sans l\'autorisation de stockage</string>
     <string name="select_time">Sélectionner l\'horaire</string>
     <string name="select_tone_for_alerts">Sélectionner le son pour les alertes</string>
+    <string name="show_unsmoothed">Afficher non-lissées</string>
+    <string name="show_unsmoothed_summary">Afficher les données non lissées même si le lissage du graphique est activé. Si le plugin d\'étalonnage est utilisé, les données non lissées (au lieu des données du plugin) seront affichées.</string>
 </resources>

From f1317d95506d81eb61f7e847686e22c677d720c0 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:28 +0100
Subject: [PATCH 22/52] New translations strings.xml (Dutch)

---
 app/src/main/res/values-nl/strings-nl.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-nl/strings-nl.xml b/app/src/main/res/values-nl/strings-nl.xml
index 217f2326a6..d09e99e96c 100644
--- a/app/src/main/res/values-nl/strings-nl.xml
+++ b/app/src/main/res/values-nl/strings-nl.xml
@@ -1655,4 +1655,6 @@
     <string name="cannot_choose_file_without_permission">Kan geen bestand kiezen zonder opslagmachtiging</string>
     <string name="select_time">Selecteer tijd</string>
     <string name="select_tone_for_alerts">Selecteer geluid voor waarschuwingen</string>
+    <string name="show_unsmoothed">Toon niet-afgevlakte waarden</string>
+    <string name="show_unsmoothed_summary">Toon niet-afgevlakte waarden ook als grafiekafvlakking is ingeschakeld. Als de kalibratieplugin aanstaat, dan worden niet-afgevlakte waarden getoond in plaats van plugin data.</string>
 </resources>

From 79ec55c4eba702a4f165e70c0c654512e2596f11 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:34 +0100
Subject: [PATCH 23/52] New translations strings.xml (Turkish)

---
 app/src/main/res/values-tr/strings-tr.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-tr/strings-tr.xml b/app/src/main/res/values-tr/strings-tr.xml
index b9aac8cd8f..a98480da86 100644
--- a/app/src/main/res/values-tr/strings-tr.xml
+++ b/app/src/main/res/values-tr/strings-tr.xml
@@ -1668,4 +1668,6 @@
     <string name="cannot_choose_file_without_permission">Depolama izni olmadan dosya seçilemiyor</string>
     <string name="select_time">Saati Seçin</string>
     <string name="select_tone_for_alerts">Uyarılar için ton seçin</string>
+    <string name="show_unsmoothed">Pürüzlü verileri göster</string>
+    <string name="show_unsmoothed_summary">Grafik yumuşatma etkinleştirilse bile pürüzlü verileri de gösterir. Kalibrasyon eklentisi kullanılıyorsa, eklenti verileri yerine pürüzlü verileri gösterecektir.</string>
 </resources>

From 49332e6a40137d1291590124e138ba7b56254b4c Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:35 +0100
Subject: [PATCH 24/52] New translations strings.xml (Swedish)

---
 app/src/main/res/values-sv/strings-sv.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-sv/strings-sv.xml b/app/src/main/res/values-sv/strings-sv.xml
index ba5178573d..2b2fff250c 100644
--- a/app/src/main/res/values-sv/strings-sv.xml
+++ b/app/src/main/res/values-sv/strings-sv.xml
@@ -1119,4 +1119,6 @@
     <string name="cannot_choose_file_without_permission">Kan inte välja fil utan behörigheter för lagringsutrymme</string>
     <string name="select_time">Välj Tid</string>
     <string name="select_tone_for_alerts">Välj ljud för Larm</string>
+    <string name="show_unsmoothed">Visa ej-utjämnad</string>
+    <string name="show_unsmoothed_summary">Visa icke-utjämnad data om också Grafutjämning är aktiverad. Om kalibreringsplugin används, kommer icke-utjämnade data visas istället för plugindata.</string>
 </resources>

From 7ca3c9f5c949b3d274a6744633c89a4bbb23d1a5 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:40 +0100
Subject: [PATCH 25/52] New translations strings.xml (Russian)

---
 app/src/main/res/values-ru/strings-ru.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ru/strings-ru.xml b/app/src/main/res/values-ru/strings-ru.xml
index dd8c162a9d..99bbe20a39 100644
--- a/app/src/main/res/values-ru/strings-ru.xml
+++ b/app/src/main/res/values-ru/strings-ru.xml
@@ -1647,4 +1647,6 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Упростить графики, сглаживая неровности</string>
     <string name="graph_smoothing">Сглаживание графика</string>
     <string name="cannot_choose_file_without_permission">Невозможно установить звук без прав доступа к хранилищу</string>
+    <string name="show_unsmoothed">Показывать несглаженные</string>
+    <string name="show_unsmoothed_summary">Показывать также несглаженные данные, если включено Сглаживание графика. Если используется плагин калибровки, то будут показываться несглаженные данные вместо данных от плагина.</string>
 </resources>

From 8b7f1bd804349c8e0c587cfeeed4f1f600c2ef4c Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:41 +0100
Subject: [PATCH 26/52] New translations strings.xml (Portuguese)

---
 app/src/main/res/values-pt/strings-pt.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pt/strings-pt.xml b/app/src/main/res/values-pt/strings-pt.xml
index fcd2e32e92..6984247d09 100644
--- a/app/src/main/res/values-pt/strings-pt.xml
+++ b/app/src/main/res/values-pt/strings-pt.xml
@@ -1669,4 +1669,6 @@
     <string name="cannot_choose_file_without_permission">Não pode selecionar ficheiro sem permissão de armazenamento</string>
     <string name="select_time">Seleccione a hora</string>
     <string name="select_tone_for_alerts">Selecione o tom para alertas</string>
+    <string name="show_unsmoothed">Mostrar sem suavização</string>
+    <string name="show_unsmoothed_summary">Mostra dados não suavizados também se a suavização do gráfico estiver ativada. Se o plugin de calibração for usado, exibirá dados não suavizados em vez de dados do plugin.</string>
 </resources>

From f0d8ada75656c4998dd09ca1bc522428817a9142 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:48 +0100
Subject: [PATCH 27/52] New translations strings.xml (Hebrew)

---
 app/src/main/res/values-he/strings-he.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-he/strings-he.xml b/app/src/main/res/values-he/strings-he.xml
index b9e3ed9800..81dcfe7d30 100644
--- a/app/src/main/res/values-he/strings-he.xml
+++ b/app/src/main/res/values-he/strings-he.xml
@@ -1530,4 +1530,7 @@
     <string name="graph_smoothing">החלקת הגרף</string>
     <string name="last_reading">קריאה אחרונה</string>
     <string name="cannot_choose_file_without_permission">אין אפשרות לבחור קובץ בלי הרשאה לאחסון</string>
+    <string name="show_unsmoothed">הראה לא מוחלק</string>
+    <string name="show_unsmoothed_summary">הראה מידע לא מוחלק גם עם החלקת הגרף מאופשרצ, 
+אם תוסף הכיול בשימוש יוצג גרף לא מוחלק ולא הגרף מהתוסף.</string>
 </resources>

From 44310cd552d90a8358287d051f0fa3926c24465b Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:50 +0100
Subject: [PATCH 28/52] New translations strings.xml (Finnish)

---
 app/src/main/res/values-fi/strings-fi.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/values-fi/strings-fi.xml b/app/src/main/res/values-fi/strings-fi.xml
index 9c1db7e474..fa3c44612b 100644
--- a/app/src/main/res/values-fi/strings-fi.xml
+++ b/app/src/main/res/values-fi/strings-fi.xml
@@ -616,6 +616,8 @@
     <string name="use_external_blukon_algorithm">Libren OOP-algoritmi.</string>
     <string name="calibrate_external_libre_algorithm_summary">Kalibroi OOP-tiedot xDripin kalibrointimenetelmillä.</string>
     <string name="calibrate_external_libre_algorithm_title">OOP-algoritmin kalibrointi</string>
+    <string name="calibrate_external_libre_2_algorithm_summary">Käytettävä kalibrointimenetelmä</string>
+    <string name="calibrate_external_libre_2_algorithm_title">OOP2-algoritmin kalibrointi.</string>
     <string name="libre_use_smoothed_data_summary">Tasoita Libren kuvaajaa laskemalla tulos 5 edellisen lukeman perusteella.</string>
     <string name="libre_use_smoothed_data_title">Tasoita Libren kuvaajaa.</string>
     <string name="retrieve_blukon_history_title">Hae Libren vanhemmat tiedot</string>
@@ -1385,6 +1387,7 @@
     <string name="title_ongoing_notification_channel">Käytä jatkuvaa ilmoituskanavaa</string>
     <string name="summary_notification_channels_grouping">Valinta ilmoitusten ryhmittelemiseksi. Yhteensopimaton \'Numerokuvake yläreunan ilmoituspalkissa\' -valinnan kanssa</string>
     <string name="title_notification_channels_grouping">Ryhmitä ilmoitukset</string>
+    <string name="title_delay_ascending_3min">Viivästetty nouseva äänenvoimakkuus</string>
     <string name="summary_play_sound_for_initial_calibration">Anna äänimerkki, kun ensimmäistä kalibrointia pyydetään</string>
     <string name="title_play_sound_for_initial_calibration">Aloituskalibroinnin hälytys</string>
     <string name="category_noisy_readings">Paljon häiriölukemia</string>
@@ -1512,6 +1515,7 @@
     <string name="nfc_is_not_enabled">NFC ei ole käytössä</string>
     <string name="phone_nfc_is_having_problems">Puhelimen NFC:llä on ongelmia!</string>
     <string name="not_so_quickly_wait_60_seconds">Ei niin nopeasti! Odota 60 sekuntia</string>
+    <string name="not_so_quickly_wait_30_seconds">Ei niin nopeasti, odota 30 sekuntia</string>
     <string name="nfc_diag_timeout">NFC lukuajan raja ylittyi</string>
     <string name="nfc_read_timeout">NFC lukuajan raja ylittyi</string>
     <string name="nfc_invalid_data__try_again">NFC tiedot virheelliset - yritä uudelleen</string>
@@ -1562,6 +1566,9 @@
     <string name="enable_streaming_dialog_text">Haluatko yhdistää tämän sensorin xDripiin? Tämä estää hälytykset Libren lukijassa ja LibreLinkissä. Paina Kyllä ja skannaa uudelleen yhdistääksesi (valitse Älä yhdistä, jos haluat käyttää xDripiä muokatun LibreLink-sovelluksen kanssa)</string>
     <string name="enable_streaming_dialog_title">Yhdistetään Libre-sensori Bluetoothiin</string>
     <string name="without_camera_permission_cannot_scan_barcode">Ilman kameran lupaa emme voi skannata viivakoodia</string>
+    <string name="title_multiple_insulin_types_settings">Useita Insuliinityyppejä</string>
+    <string name="title_multiple_insulin_types">Useita Insuliinityyppejä</string>
+    <string name="use_for_calibration">Käytetäänkö %s kalibrointiin?</string>
     <string name="no_never">Ei, Ei Koskaan</string>
     <string name="cannot_choose_file_without_permission">Tiedostoa ei voida valita ilman tallennustilan käyttöoikeutta</string>
 </resources>

From b66ad135c65ba832a469cee64aaa2d2a368edca8 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:08:58 +0100
Subject: [PATCH 29/52] New translations strings.xml (Spanish)

---
 app/src/main/res/values-es/strings-es.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-es/strings-es.xml b/app/src/main/res/values-es/strings-es.xml
index 38bb82d41f..2685787e14 100644
--- a/app/src/main/res/values-es/strings-es.xml
+++ b/app/src/main/res/values-es/strings-es.xml
@@ -1665,5 +1665,10 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Simplificar los gráficos suavizando las irregularidades</string>
     <string name="graph_smoothing">Suavizar gráficos</string>
     <string name="last_reading">Última lectura</string>
+    <string name="select_file_for_alert">Seleccione archivo para alerta</string>
     <string name="cannot_choose_file_without_permission">No se puede elegir el archivo sin permiso de almacenamiento</string>
+    <string name="select_time">Seleccionar el Tiempo</string>
+    <string name="select_tone_for_alerts">Seleccionar tono de alerta</string>
+    <string name="show_unsmoothed">Mostrar no suavizados</string>
+    <string name="show_unsmoothed_summary">Mostrar datos sin suavizar también si el suavizado gráfico está habilitado. Si se utiliza el plugin de calibración, se mostrarán datos sin suavizar en lugar de datos del plugin.</string>
 </resources>

From 6d3ceba28f54e1703cf8b212d42916cd7c59738d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:09:01 +0100
Subject: [PATCH 30/52] New translations strings.xml (Polish)

---
 app/src/main/res/values-pl/strings-pl.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pl/strings-pl.xml b/app/src/main/res/values-pl/strings-pl.xml
index 37ba0b202e..52a3bc2bc6 100644
--- a/app/src/main/res/values-pl/strings-pl.xml
+++ b/app/src/main/res/values-pl/strings-pl.xml
@@ -1576,4 +1576,6 @@
     <string name="cannot_choose_file_without_permission">Nie można wybrać pliku bez uprawnień do przechowywania</string>
     <string name="select_time">Wybierz Czas</string>
     <string name="select_tone_for_alerts">Wybierz dźwięk dla alarmów</string>
+    <string name="show_unsmoothed">Pokaż niewygładzone</string>
+    <string name="show_unsmoothed_summary">Pokaż niewygładzone dane również, jeśli wygładzanie wykresu jest włączone. Jeśli używana jest wtyczka kalibracyjna, pokaże niewygładzone dane zamiast danych wtyczki.</string>
 </resources>

From e1a8488d220156cb9eda59288a3b48c32a5f1d33 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 07:38:24 +0000
Subject: [PATCH 31/52] JoH: add additional utility methods

---
 .../eveningoutpost/dexdrip/Models/JoH.java    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java b/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
index 92670d769c..c96503b950 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
@@ -45,6 +45,7 @@
 import android.os.SystemClock;
 import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
+import android.support.v4.content.CursorLoader;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.view.ContextThemeWrapper;
@@ -79,6 +80,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -89,6 +91,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
@@ -418,6 +421,23 @@ public static String ucFirst(String input) {
         return input.substring(0, 1).toUpperCase() + input.substring(1).toLowerCase();
     }
 
+    public static String readLine(final InputStream stream) {
+        try {
+            val buffer = new byte[512];
+            for (int i = 0; i < buffer.length; i++) {
+                val b = stream.read();
+                if (b == -1) return null;
+                if (b == '\n') {
+                    return new String(buffer, 0, i, StandardCharsets.UTF_8);
+                }
+                buffer[i] = (byte) b;
+            }
+        } catch (IOException e) {
+            UserError.Log.e(TAG, "Error reading line: " + e);
+        }
+        return null; // too big
+    }
+
     public static boolean isSamsung() {
         return Build.MANUFACTURER.toLowerCase().contains("samsung");
     }
@@ -439,6 +459,22 @@ public static void setBuggySamsungEnabled() {
         }
     }
 
+    public static String getFieldFromURI(final String column, final Uri contentUri) {
+        try {
+            final String[] projection = { column };
+            val loader = new CursorLoader(xdrip.getAppContext(), contentUri, projection, null, null, null);
+            val cursor = loader.loadInBackground();
+            val column_index = cursor.getColumnIndexOrThrow(column);
+            cursor.moveToFirst();
+            val result = cursor.getString(column_index);
+            cursor.close();
+            return result;
+        } catch (Exception e) {
+            UserError.Log.d(TAG, "Got exception extracting data for uri " + e);
+            return null;
+        }
+    }
+
 
     public static class DecimalKeyListener extends DigitsKeyListener {
         private final char[] acceptedCharacters =

From 6a5072339bb6b2f504891d03b2b1f104c4a70225 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:20:36 +0000
Subject: [PATCH 32/52] Cpref: add port range validation

---
 .../dexdrip/cgm/webfollow/Cpref.java           | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/webfollow/Cpref.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/webfollow/Cpref.java
index 87913de5b5..a221eaaa7a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/webfollow/Cpref.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/webfollow/Cpref.java
@@ -6,12 +6,17 @@
 import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
 import com.eveningoutpost.dexdrip.UtilityModels.Pref;
 
+import lombok.val;
+
 /**
  * JamOrHam
  * Preference handling repository
  */
 
 public class Cpref {
+
+    private static final String DEFAULT_PORT = "8080";
+
     public static String get(final String which) {
 
         switch (which) {
@@ -28,7 +33,9 @@ public static String get(final String which) {
             case "HA":
                 return Pref.getStringTrimmed("webfollow_proxy_address", null);
             case "HP":
-                return Pref.getStringTrimmed("webfollow_proxy_port", null);
+                val p = Pref.getStringTrimmed("webfollow_proxy_port", null);
+                return (validatePort(p) ? p : DEFAULT_PORT);
+
         }
         return null;
     }
@@ -55,4 +62,13 @@ static void startWithRefresh(boolean full) {
         Inevitable.task("webfollow-preference-changed", 2000, () -> JoH.startService(WebFollowService.class, "function", full ? "fullrefresh" : "refresh"));
     }
 
+    private static boolean validatePort(final String p) {
+        try {
+            val i = Integer.parseInt(p);
+            return i >= 1 && i <= 65535;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
 }

From 54cb5b48f60fa35de2d265bf6f46872504c0cd0f Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:23:10 +0000
Subject: [PATCH 33/52] EditAlertActivity: use utility method for cursor lookup

---
 .../dexdrip/EditAlertActivity.java            | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
index e3157dab53..ea7776b4e2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
@@ -20,7 +20,6 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.content.CursorLoader;
 import android.text.InputType;
 import android.text.format.DateFormat;
 import android.text.method.DigitsKeyListener;
@@ -739,29 +738,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private static String getDisplayNameFromURI(final Uri contentUri) {
-        val title = getFieldFromURI(MediaStore.Audio.Media.TITLE, contentUri);
+        val title = JoH.getFieldFromURI(MediaStore.Audio.Media.TITLE, contentUri);
         if (title == null || contentUri.toString().endsWith(title)) {
-            return getFieldFromURI(MediaStore.Audio.Media.DISPLAY_NAME, contentUri);
+            return JoH.getFieldFromURI(MediaStore.Audio.Media.DISPLAY_NAME, contentUri);
         }
         return title;
     }
 
-    private static String getFieldFromURI(final String column, final Uri contentUri) {
-        try {
-            String[] projection = { column };
-            val loader = new CursorLoader(xdrip.getAppContext(), contentUri, projection, null, null, null);
-            val cursor = loader.loadInBackground();
-            val column_index = cursor.getColumnIndexOrThrow(column);
-            cursor.moveToFirst();
-            val result = cursor.getString(column_index);
-            cursor.close();
-            return result;
-        } catch (Exception e) {
-            Log.d(TAG, "Got exception extracting data for uri " + e);
-            return null;
-        }
-    }
-
 
     static public String timeFormatString(Context context, int hour, int minute) {
         SimpleDateFormat timeFormat24 = new SimpleDateFormat("HH:mm");

From 3ab69a68713926691faa8cd723863d265d92c18a Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:39:57 +0000
Subject: [PATCH 34/52] Home: use parent priority for shelf dialog

---
 app/src/main/java/com/eveningoutpost/dexdrip/Home.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
index fbbd88104f..deecc5334b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -394,13 +394,12 @@ protected void onCreate(Bundle savedInstanceState) {
         mToolbar.setOnLongClickListener(v -> {
             // show configurator
             final ActivityHomeShelfSettingsBinding binding = ActivityHomeShelfSettingsBinding.inflate(getLayoutInflater());
-            final Dialog dialog = new Dialog(v.getContext());
+            final Dialog dialog = new Dialog(home);
             dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
             binding.setVs(homeShelf);
             binding.setHome(home);
             homeShelf.set("arrow_configurator", false);
             dialog.setContentView(binding.getRoot());
-            dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             dialog.show();
             return false;
         });
@@ -2018,7 +2017,7 @@ private void setupCharts(final String source) {
                 gestureDetector.set(previewChartTouchHandler, new InterceptingGestureHandler(this, previewActiveDetector));
             }
         } catch (NullPointerException | NoSuchFieldException | IllegalAccessException | ClassCastException e) {
-            e.printStackTrace();
+            UserError.Log.d(TAG, "Exception injecting touch handler: " + e);
         }
 
         chart.getChartData().setAxisXTop(null);

From 3e88f2f27f193b68354d42d6f9a50cb1f0ffad3d Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 09:45:00 +0000
Subject: [PATCH 35/52] Parakeet: remove map feature

---
 .../eveningoutpost/dexdrip/MapsActivity.java  | 237 +++++++++---------
 1 file changed, 122 insertions(+), 115 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java
index efa5edf7ce..30cfd2a1f2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/MapsActivity.java
@@ -10,21 +10,22 @@
 import android.util.Log;
 import android.view.WindowManager;
 
+import com.eveningoutpost.dexdrip.Models.JoH;
 import com.eveningoutpost.dexdrip.UtilityModels.Pref;
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.OnMapReadyCallback;
-import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-import com.google.android.gms.maps.model.CircleOptions;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.MarkerOptions;
-import com.google.android.gms.maps.model.PolylineOptions;
+//import com.google.android.gms.maps.CameraUpdateFactory;
+//import com.google.android.gms.maps.GoogleMap;
+//import com.google.android.gms.maps.OnMapReadyCallback;
+//import com.google.android.gms.maps.SupportMapFragment;
+//import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+//import com.google.android.gms.maps.model.CircleOptions;
+//import com.google.android.gms.maps.model.LatLng;
+//import com.google.android.gms.maps.model.MarkerOptions;
+//import com.google.android.gms.maps.model.PolylineOptions;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MapsActivity extends FragmentActivity implements OnMapReadyCallback {
+public class MapsActivity extends FragmentActivity { // implements OnMapReadyCallback {
 
     private static final String defaultLocation = "-31.988644,115.515637"; // default bogus position
     private static final String TAG = "jamorham map";
@@ -32,106 +33,106 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
     private static List<Double> longs = new ArrayList<Double>();
     private static List<Double> lats = new ArrayList<Double>();
     private static boolean active = false;
-    private static GoogleMap mMap;
+    //private static GoogleMap mMap;
     private static Activity static_activity;
 
     // receive updates from elsewhere
     public static void newMapLocation(String location, long when) {
-        try {
-            if ((location != null) && (location.length()>5)) {
-                Log.d(TAG,"New location: "+location);
-                try {
-                    lastGeoLocation = location;
-                    String[] splits = lastGeoLocation.split(",");
-                    if (splits.length == 2) {
-                        Double thislat = Double.parseDouble(splits[0]);
-                        Double thislong = Double.parseDouble(splits[1]);
-                        if ((thislat != 0) && (thislong != 0)) {
-                            if (longs.size() > 0) {
-                                if ((longs.get(longs.size() - 1).equals(thislong))
-                                        && (lats.get(lats.size() - 1).equals(thislat))) {
-                                    return; // dupe
-                                }
-                            }
-                            longs.add(thislong);
-                            lats.add(thislat);
-                            if (longs.size() > 20) {
-                                longs.remove(0);
-                                lats.remove(0);
-                            }
-                            // relay location
-                            if (Pref.getBooleanDefaultFalse("plus_follow_master")
-                                    && Pref.getBooleanDefaultFalse("plus_follow_geolocation")
-                                    && (!Home.get_follower())) {
-                                GcmActivity.sendLocation(location);
-                            }
-                        }
-                    }
-                    if (active) {
-                        static_activity.startActivity(new Intent(xdrip.getAppContext(), MapsActivity.class));
-                    }
-                } catch (Exception e)
-                {
-                    Log.e(TAG,"Got exception with new map location: "+e.toString());
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "Got exception in newmaplocation: " + e.toString());
-        }
+//        try {
+//            if ((location != null) && (location.length()>5)) {
+//                Log.d(TAG,"New location: "+location);
+//                try {
+//                    lastGeoLocation = location;
+//                    String[] splits = lastGeoLocation.split(",");
+//                    if (splits.length == 2) {
+//                        Double thislat = Double.parseDouble(splits[0]);
+//                        Double thislong = Double.parseDouble(splits[1]);
+//                        if ((thislat != 0) && (thislong != 0)) {
+//                            if (longs.size() > 0) {
+//                                if ((longs.get(longs.size() - 1).equals(thislong))
+//                                        && (lats.get(lats.size() - 1).equals(thislat))) {
+//                                    return; // dupe
+//                                }
+//                            }
+//                            longs.add(thislong);
+//                            lats.add(thislat);
+//                            if (longs.size() > 20) {
+//                                longs.remove(0);
+//                                lats.remove(0);
+//                            }
+//                            // relay location
+//                            if (Pref.getBooleanDefaultFalse("plus_follow_master")
+//                                    && Pref.getBooleanDefaultFalse("plus_follow_geolocation")
+//                                    && (!Home.get_follower())) {
+//                                GcmActivity.sendLocation(location);
+//                            }
+//                        }
+//                    }
+//                    if (active) {
+//                        static_activity.startActivity(new Intent(xdrip.getAppContext(), MapsActivity.class));
+//                    }
+//                } catch (Exception e)
+//                {
+//                    Log.e(TAG,"Got exception with new map location: "+e.toString());
+//                }
+//            }
+//        } catch (Exception e) {
+//            Log.e(TAG, "Got exception in newmaplocation: " + e.toString());
+//        }
     }
 
-    private static void redrawmap() {
-        Log.d(TAG, "Attempting to redraw map: " + lastGeoLocation);
-        if (mMap == null) return;
-        mMap.clear();
-
-        String[] splits = lastGeoLocation.split(",");
-        // sanity check goes here
-        LatLng mylocation;
-        try {
-            mylocation = new LatLng(Double.parseDouble(splits[0]), Double.parseDouble(splits[1]));
-        } catch (NumberFormatException e) {
-            Log.e(TAG, "Mylocation number exception: '" + lastGeoLocation + "'");
-            return;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            Log.e(TAG, "Mylocation array index exception: '" + lastGeoLocation + "'");
-            return;
-        }
-            CircleOptions circleOptions = new CircleOptions()
-                .center(mylocation)
-                .strokeWidth(2)
-                .strokeColor(Color.GRAY)
-                .radius(1500);
-
-        String title = "";
-
-        if (lastGeoLocation.equals(defaultLocation)) {
-            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(mylocation, 16));
-            title = "No location data yet";
-        } else {
-            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(mylocation, 13));
-        }
-
-        if (lats.size() > 0) {
-            PolylineOptions mylines = new PolylineOptions();
-            for (int c = 0; c < lats.size(); c++) {
-                mylines.add(new LatLng(lats.get(c), longs.get(c)));
-            }
-            mylines.width(1);
-            mylines.color(Color.parseColor("#2ba367"));
-            mMap.addPolyline(mylines);
-        }
-
-        mMap.addCircle(circleOptions);
-        mMap.addMarker(new MarkerOptions()
-                .position(mylocation)
-                .title(title)
-                .alpha(0.9f)
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.jamorham_parakeet_marker)));
-
-        mMap.getUiSettings().setMapToolbarEnabled(false);
-        mMap.getUiSettings().setMyLocationButtonEnabled(true);
-    }
+//    private static void redrawmap() {
+//        Log.d(TAG, "Attempting to redraw map: " + lastGeoLocation);
+//        if (mMap == null) return;
+//        mMap.clear();
+//
+//        String[] splits = lastGeoLocation.split(",");
+//        // sanity check goes here
+//        LatLng mylocation;
+//        try {
+//            mylocation = new LatLng(Double.parseDouble(splits[0]), Double.parseDouble(splits[1]));
+//        } catch (NumberFormatException e) {
+//            Log.e(TAG, "Mylocation number exception: '" + lastGeoLocation + "'");
+//            return;
+//        } catch (ArrayIndexOutOfBoundsException e) {
+//            Log.e(TAG, "Mylocation array index exception: '" + lastGeoLocation + "'");
+//            return;
+//        }
+//            CircleOptions circleOptions = new CircleOptions()
+//                .center(mylocation)
+//                .strokeWidth(2)
+//                .strokeColor(Color.GRAY)
+//                .radius(1500);
+//
+//        String title = "";
+//
+//        if (lastGeoLocation.equals(defaultLocation)) {
+//            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(mylocation, 16));
+//            title = "No location data yet";
+//        } else {
+//            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(mylocation, 13));
+//        }
+//
+//        if (lats.size() > 0) {
+//            PolylineOptions mylines = new PolylineOptions();
+//            for (int c = 0; c < lats.size(); c++) {
+//                mylines.add(new LatLng(lats.get(c), longs.get(c)));
+//            }
+//            mylines.width(1);
+//            mylines.color(Color.parseColor("#2ba367"));
+//            mMap.addPolyline(mylines);
+//        }
+//
+//        mMap.addCircle(circleOptions);
+//        mMap.addMarker(new MarkerOptions()
+//                .position(mylocation)
+//                .title(title)
+//                .alpha(0.9f)
+//                .icon(BitmapDescriptorFactory.fromResource(R.drawable.jamorham_parakeet_marker)));
+//
+//        mMap.getUiSettings().setMapToolbarEnabled(false);
+//        mMap.getUiSettings().setMyLocationButtonEnabled(true);
+//    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -139,21 +140,27 @@ protected void onCreate(Bundle savedInstanceState) {
         active = true;
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_maps);
+//        setContentView(R.layout.activity_maps);
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.map);
-        mapFragment.getMapAsync(this);
-    }
+//        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
+//                .findFragmentById(R.id.map);
+//        mapFragment.getMapAsync(this);
+
+        // Sept 2022 - Discontinued Parakeet map feature as believed no longer in use
+        // Code remains for reference for now. Due for removal Sept 2023
+        JoH.static_toast_long("Maps feature discontinued Sept 2022");
+        finish();
 
-    @Override
-    public void onMapReady(GoogleMap googleMap) {
-        mMap = googleMap;
-        static_activity = this;
-        active = true;
-        redrawmap();
     }
 
+//    @Override
+//    public void onMapReady(GoogleMap googleMap) {
+//        mMap = googleMap;
+//        static_activity = this;
+//        active = true;
+//        redrawmap();
+//    }
+
     @Override
     public void onPause() {
         active = false;

From d3e52c27aeb37b7e571238d586011e8a7ebaddb7 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 09:47:14 +0000
Subject: [PATCH 36/52] UiBased: add filter unit test

---
 .../Services/UiBasedCollectorTest.java        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/Services/UiBasedCollectorTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/Services/UiBasedCollectorTest.java
index 6906a2b796..41c290214b 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/Services/UiBasedCollectorTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/Services/UiBasedCollectorTest.java
@@ -4,6 +4,8 @@
 
 import org.junit.Test;
 
+import lombok.val;
+
 public class UiBasedCollectorTest {
 
     @Test
@@ -25,4 +27,21 @@ public void isValidMmolTest() {
 
 
     }
+
+    @Test
+    public void filterStringTest() {
+        val i = new UiBasedCollector();
+        val spec1 = "non spec";
+        val spec2 = "≤5.123";
+        val spec2p = "5.123";
+        val spec3 = "≥100.123";
+        val spec3p = "100.123";
+        assertWithMessage("null test pass through 1").that(i.filterString(spec1)).isEqualTo(spec1);
+        assertWithMessage("null test pass through 2").that(i.filterString(spec2)).isEqualTo(spec2);
+        assertWithMessage("null test pass through 3").that(i.filterString(spec3)).isEqualTo(spec3);
+        i.lastPackage = "hello world";
+        assertWithMessage("non 1").that(i.filterString(spec1)).isEqualTo(spec1);
+        assertWithMessage("gte 1").that(i.filterString(spec2)).isEqualTo(spec2p);
+        assertWithMessage("lte 1").that(i.filterString(spec3)).isEqualTo(spec3p);
+    }
 }
\ No newline at end of file

From 4e2e5ace84abc18c3750fd6188417ea47107dad3 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 09:48:32 +0000
Subject: [PATCH 37/52] SdcardImportExport: increase hard reset timeout

---
 .../com/eveningoutpost/dexdrip/utils/SdcardImportExport.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java
index ae140550e4..509057b582 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/SdcardImportExport.java
@@ -40,7 +40,7 @@ public class SdcardImportExport extends BaseAppCompatActivity {
     private final static String TAG = "jamorham sdcard";
     private final static int MY_PERMISSIONS_REQUEST_STORAGE = 104;
     public final static int TRIGGER_RESTORE_PERMISSIONS_REQUEST_STORAGE = 9104;
-    private final static String PREFERENCES_FILE = "shared_prefs/" + xdrip.getAppContext().getString(R.string.local_target_package) + "_preferences.xml";
+    public final static String PREFERENCES_FILE = "shared_prefs/" + xdrip.getAppContext().getString(R.string.local_target_package) + "_preferences.xml";
     private final static String EXPORT_FOLDER = "xDrip-export";
     private static boolean backupDismissed;
     //private static Activity activity;
@@ -116,7 +116,7 @@ public void savePreferencesToSD(View myview) {
     }
 
     public static void hardReset() {
-        JoH.wakeUpIntent(xdrip.getAppContext(), 1000, Home.getHomePendingIntent());
+        JoH.wakeUpIntent(xdrip.getAppContext(), 4000, Home.getHomePendingIntent());
         hardReset_orig();
     }
 

From 14ddc6b39d6904b0008198d726e522d873b02c5c Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 12:01:36 +0100
Subject: [PATCH 38/52] New translations strings.xml (Croatian)

---
 app/src/main/res/values-hr/strings-hr.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-hr/strings-hr.xml b/app/src/main/res/values-hr/strings-hr.xml
index c782c6da8e..317fe4a9a6 100644
--- a/app/src/main/res/values-hr/strings-hr.xml
+++ b/app/src/main/res/values-hr/strings-hr.xml
@@ -992,4 +992,6 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Pojednostavite grafikone izglađivanjem nepravilnosti</string>
     <string name="graph_smoothing">Izglađivanje grafikona</string>
     <string name="last_reading">Zadnje očitanje</string>
+    <string name="show_unsmoothed">Prikaži neuglađeno</string>
+    <string name="show_unsmoothed_summary">Prikaži i neizglađene podatke ako je omogućeno izglađivanje grafikona. Ako se koristi dodatak za kalibraciju, prikazat će neizglađene podatke umjesto podataka dodatka.</string>
 </resources>

From d90a38ea0c4aee0151c6a5bc9d193858fe2f184b Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 11:50:14 +0000
Subject: [PATCH 39/52] BindingAdapterUtils: add fast off animations

---
 .../dexdrip/BindingAdapterUtils.java          | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java b/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java
index cb8a378103..4e6c393f29 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/BindingAdapterUtils.java
@@ -34,9 +34,21 @@ public static void setShowIfTrueAnimated(@NonNull View view, boolean isVisible)
 
     @BindingAdapter(value = {"showIfTrueAnimated"}, requireAll = true)
     public static void setShowIfTrueAnimatedBoolean(@NonNull View view, Boolean isVisible) {
-       setShowIfTrueAnimated(view, isVisible != null ? isVisible : false);
+        setShowIfTrueAnimated(view, isVisible != null ? isVisible : false);
     }
 
+
+    @BindingAdapter(value = {"showIfTrueAnimatedFastOff"}, requireAll = true)
+    public static void setShowIfTrueAnimatedFastOff(@NonNull View view, boolean isVisible) {
+        setVisibility(view, isVisible ? View.VISIBLE : View.GONE, 50, 600);
+    }
+
+    @BindingAdapter(value = {"showIfTrueAnimatedFastOff"}, requireAll = true)
+    public static void setShowIfTrueAnimatedBooleanFastOff(@NonNull View view, Boolean isVisible) {
+        setVisibility(view, isVisible ? View.VISIBLE : View.GONE, 50, 600);
+    }
+
+
     @BindingAdapter(value = {"showIfTrue"}, requireAll = true)
     public static void setShowIfTrue(@NonNull View view, boolean isVisible) {
         view.setVisibility(isVisible ? View.VISIBLE : View.GONE);
@@ -96,6 +108,12 @@ public static void buttonIndicate(Button button, boolean set) {
     @BindingAdapter(value = {"animatedVisibility"})
     public static synchronized void setVisibility(@NonNull final View view,
                                                   final int visibility) {
+        setVisibility(view, visibility, 600, 600);
+    }
+
+    public static synchronized void setVisibility(@NonNull final View view,
+                                                  final int visibility, int offSpeed, int onSpeed) {
+
         // Were we animating before? If so, what was the visibility?
         Integer endAnimVisibility = (Integer) view.getTag(FINAL_VISIBILITY_ID);
         int oldVisibility = endAnimVisibility == null
@@ -122,8 +140,8 @@ public static synchronized void setVisibility(@NonNull final View view,
         // Create the animator
         final ObjectAnimator alpha = ObjectAnimator.ofFloat(view, View.ALPHA, startAlpha, endAlpha);
 
-        final long duration = 600;
-        final long stagger = 150;
+        final long duration = willBeVisible ? onSpeed : offSpeed;
+        final long stagger = duration / 4;
         alpha.setDuration(duration);
 
         // Stagger animations keyed at the same moment
@@ -160,6 +178,5 @@ public void onAnimationEnd(Animator anim) {
         });
         alpha.start();
     }
-
 }
 

From 4aeee42f3dd6a51f4e215078b676682360cc3521 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Thu, 8 Sep 2022 17:23:46 +0000
Subject: [PATCH 40/52] CloudBackup: merge feature branch

---
 app/build.gradle                              |  36 +-
 app/src/main/AndroidManifest.xml              | 129 +++--
 .../dexdrip/GcmListenerSvc.java               |  14 +-
 .../java/com/eveningoutpost/dexdrip/Home.java |   5 +
 .../dexdrip/LicenseAgreementActivity.java     |  34 +-
 .../dexdrip/Services/DailyIntentService.java  |   7 +
 .../dexdrip/UtilityModels/Constants.java      |   1 +
 .../dexdrip/UtilityModels/VoiceCommands.java  |   3 +
 .../dexdrip/cloud/backup/Backup.java          | 530 ++++++++++++++++++
 .../dexdrip/cloud/backup/BackupActivity.java  | 324 +++++++++++
 .../cloud/backup/BackupBaseActivity.java      | 154 +++++
 .../dexdrip/cloud/backup/BackupMetaData.java  |  98 ++++
 .../dexdrip/cloud/backup/BackupStatus.java    |  11 +
 .../dexdrip/cloud/backup/DriveManager.java    | 174 ++++++
 .../dexdrip/cloud/backup/LogStatus.java       |  12 +
 .../res/layout/activity_backup_picker.xml     | 115 ++++
 app/src/main/res/layout/bound_status_item.xml |  64 +++
 app/src/main/res/menu/menu_home.xml           |   9 +
 app/src/main/res/values/strings.xml           |  54 ++
 .../dexdrip/ui/TranslationTest.java           |   9 +-
 build.gradle                                  |   1 +
 21 files changed, 1680 insertions(+), 104 deletions(-)
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/Backup.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupActivity.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupBaseActivity.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupMetaData.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupStatus.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/DriveManager.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/LogStatus.java
 create mode 100644 app/src/main/res/layout/activity_backup_picker.xml
 create mode 100644 app/src/main/res/layout/bound_status_item.xml

diff --git a/app/build.gradle b/app/build.gradle
index 153abb8692..e80ed394da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,7 @@ if (getGradle().getStartParameter().getTaskRequests().toString().contains("Relea
         variantMapsEnabled false
         uploadMapsForVariant ''
     }*/
+    apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 }
 
 repositories {
@@ -137,10 +138,25 @@ android {
         disable 'ExtraTranslation'
     }
 
+    configurations {
+        all {
+            exclude group: 'commons-logging', module: 'commons-logging'
+            exclude group: 'org.apache.httpcomponents'
+        }
+    }
+
     packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
         exclude 'META-INF/INDEX.LIST'
         exclude 'META-INF/NOTICE.md'
         exclude 'META-INF/LICENSE.md'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'org/apache/http/version.properties'
+        exclude 'org/apache/http/client/version.properties'
+        exclude 'META-INF/ASL2.0'
     }
 
     compileOptions {
@@ -235,12 +251,20 @@ dependencies {
     implementation 'com.android.support:recyclerview-v7:26.1.0'
     implementation 'com.android.support:cardview-v7:26.1.0'
     implementation 'com.android.support:preference-v7:26.1.0'
-    //implementation 'com.google.android.gms:play-services-drive:9.4.0'
-    implementation 'com.google.firebase:firebase-messaging:10.2.1'
-    implementation 'com.google.android.gms:play-services-maps:10.2.1'
-    implementation 'com.google.android.gms:play-services-wearable:10.2.1'
-    implementation 'com.google.android.gms:play-services-location:10.2.1'
-    implementation "com.google.android.gms:play-services-gcm:10.2.1"
+
+    implementation ('com.google.apis:google-api-services-drive:v3-rev20220815-2.0.0') {
+        exclude group: 'org.apache.httpcomponents'
+    }
+    implementation 'com.google.api-client:google-api-client-android:1.26.0'
+
+    implementation 'com.google.android.gms:play-services-auth:15.0.0'
+    implementation 'com.google.firebase:firebase-messaging:15.0.0'
+   // implementation 'com.google.android.gms:play-services-maps:15.0.0'
+    implementation 'com.google.android.gms:play-services-wearable:15.0.0'
+    implementation 'com.google.android.gms:play-services-location:15.0.0'
+    implementation "com.google.android.gms:play-services-gcm:15.0.0"
+    implementation "com.google.android.gms:play-services-oss-licenses:15.0.0"
+
     implementation 'com.squareup.wire:wire-runtime:2.2.0'
     implementation 'com.squareup.okhttp:okhttp:2.7.5'
     implementation 'com.squareup.okhttp3:okhttp:3.12.13'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f23f2d041c..731de956ff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="InnerclassSeparator"
     package="com.eveningoutpost.dexdrip"
-    android:installLocation="internalOnly">
+    android:installLocation="internalOnly"
+    tools:ignore="InnerclassSeparator">
     <!-- To receive data from HAPP. -->
     <uses-permission android:name="com.eveningoutpost.dexdrip.permissions.RECEIVE_EXTERNAL_STATUSLINE" />
 
@@ -62,9 +62,14 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:usesCleartextTraffic="true"
+        android:maxAspectRatio="2.1"
         android:theme="@style/AppTheme"
-        android:maxAspectRatio="2.1">
+        android:usesCleartextTraffic="true">
+        <activity
+            android:name=".cloud.backup.BackupActivity"
+            android:label="Cloud Backup"
+            android:exported="false" />
+
         <meta-data
             android:name="AA_DB_NAME"
             android:value="DexDrip.db" />
@@ -87,8 +92,9 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
         </provider>
+
         <activity
             android:name=".Home"
             android:label="@string/app_name_launcher"
@@ -109,8 +115,7 @@
             android:name=".Services.DexCollectionService"
             android:enabled="true"
             android:exported="true"
-            android:foregroundServiceType="connectedDevice|location"
-            />
+            android:foregroundServiceType="connectedDevice|location" />
         <service
             android:name=".Services.WifiCollectionService"
             android:enabled="true"
@@ -120,7 +125,7 @@
         <service
             android:name=".Services.broadcastservice.BroadcastService"
             android:enabled="true"
-            android:exported="true"></service>
+            android:exported="true" />
         <service
             android:name=".wearintegration.WatchUpdaterService"
             android:exported="true">
@@ -229,11 +234,14 @@
                 <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".utils.framework.IncomingCallsReceiver" android:enabled="true" >
+        <receiver
+            android:name=".utils.framework.IncomingCallsReceiver"
+            android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.PHONE_STATE" />
             </intent-filter>
         </receiver>
+
         <activity
             android:name=".tables.CalibrationDataTable"
             android:label="@string/calibration_data_table" />
@@ -264,13 +272,12 @@
             android:name=".Services.SyncService"
             android:enabled="true"
             android:exported="true" />
-
         <service
             android:name=".ImportedLibraries.dexcom.SyncingService"
             android:enabled="true"
             android:exported="true" />
-
-        <service android:name=".Services.UiBasedCollector"
+        <service
+            android:name=".Services.UiBasedCollector"
             android:label="UiBasedCollector"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
@@ -369,20 +376,18 @@
             android:exported="true" />
         <service
             android:name=".Services.Ob1G5CollectionService"
-            android:foregroundServiceType="connectedDevice|location"
-            android:enabled="true" />
+            android:enabled="true"
+            android:foregroundServiceType="connectedDevice|location" />
         <service
             android:name=".insulin.pendiq.PendiqService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="connectedDevice|location"
-            />
+            android:foregroundServiceType="connectedDevice|location" />
         <service
             android:name=".cgm.medtrum.MedtrumCollectionService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="connectedDevice|location"
-            />
+            android:foregroundServiceType="connectedDevice|location" />
 
         <activity
             android:name=".ShareTest"
@@ -443,8 +448,7 @@
             android:name=".UtilityModels.pebble.PebbleWatchSync"
             android:enabled="true"
             android:exported="true"
-            android:foregroundServiceType="connectedDevice|location"
-            />
+            android:foregroundServiceType="connectedDevice|location" />
         <service
             android:name=".Services.DailyIntentService"
             android:exported="false" />
@@ -494,7 +498,7 @@
                 <action android:name="com.eveningoutpost.dexdrip.OOP2_BLUETOOTH_ENABLE_RESULT" />
             </intent-filter>
         </receiver>
-        <receiver android:name="com.eveningoutpost.dexdrip.watch.thinjam.io.ThinJamApiReceiver">
+        <receiver android:name=".watch.thinjam.io.ThinJamApiReceiver">
             <intent-filter>
                 <action android:name="com.eveningoutpost.dexdrip.THINJAM_API" />
             </intent-filter>
@@ -529,8 +533,8 @@
         <receiver
             android:name=".receiver.ReminderReceiver"
             android:enabled="true"
-            android:exported="true">
-        </receiver>
+            android:exported="true"></receiver>
+
         <service
             android:name=".TaskService"
             android:exported="true"
@@ -539,11 +543,16 @@
                 <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
             </intent-filter>
         </service>
-        <service android:name=".Services.AlwaysOnDisplayService" android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+        <service
+            android:name=".Services.AlwaysOnDisplayService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService"/>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
             </intent-filter>
-            <meta-data android:name="android.accessibilityservice" android:resource="@xml/accessibility_service"/>
+
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/accessibility_service" />
         </service>
         <service
             android:name=".UtilityModels.XDripDreamService"
@@ -598,7 +607,6 @@
             android:name=".utils.SdcardImportExport"
             android:configChanges="orientation|screenSize"
             android:label="@string/settings_on_external_storage" />
-
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
              (See the file "res/values/google_maps_api.xml").
@@ -616,18 +624,17 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_maps"
             android:noHistory="true" />
+        <activity
+            android:name=".profileeditor.BasalProfileEditor"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/basal_editor"
+            android:screenOrientation="landscape" />
 
-                <activity
-                    android:name=".profileeditor.BasalProfileEditor"
-                    android:configChanges="orientation|keyboardHidden"
-                    android:label="@string/basal_editor"
-                    android:screenOrientation="landscape" />
         <service
             android:name=".Services.DoNothingService"
             android:enabled="true"
             android:exported="true"
-            android:foregroundServiceType="connectedDevice|location"
-            />
+            android:foregroundServiceType="connectedDevice|location" />
 
         <activity android:name=".HelpActivity" />
         <activity
@@ -718,21 +725,21 @@
             android:name=".wearintegration.Amazfitservice"
             android:enabled="true"
             android:exported="true" />
-        <service android:name=".watch.lefun.LeFunService"
-            android:foregroundServiceType="connectedDevice|location"
-            />
-        <service android:name=".watch.miband.MiBandService"
-            android:foregroundServiceType="connectedDevice|location"
-            />
-        <service android:name=".cgm.nsfollow.NightscoutFollowService"
-            android:foregroundServiceType="dataSync"
-            />
-        <service android:name=".insulin.inpen.InPenService"
-            android:foregroundServiceType="connectedDevice|location"
-            />
-        <service android:name=".cgm.sharefollow.ShareFollowService"
-            android:foregroundServiceType="dataSync"
-            />
+        <service
+            android:name=".watch.lefun.LeFunService"
+            android:foregroundServiceType="connectedDevice|location" />
+        <service
+            android:name=".watch.miband.MiBandService"
+            android:foregroundServiceType="connectedDevice|location" />
+        <service
+            android:name=".cgm.nsfollow.NightscoutFollowService"
+            android:foregroundServiceType="dataSync" />
+        <service
+            android:name=".insulin.inpen.InPenService"
+            android:foregroundServiceType="connectedDevice|location" />
+        <service
+            android:name=".cgm.sharefollow.ShareFollowService"
+            android:foregroundServiceType="dataSync" />
 
         <activity
             android:name=".EventLogActivity"
@@ -744,7 +751,6 @@
         <activity
             android:name=".ui.activities.SelectAudioDevice"
             android:label="@string/select_device" />
-
         <activity
             android:name=".UtilityModels.MtpConfigureActivity"
             android:label="USB programmer" />
@@ -752,17 +758,20 @@
             android:name=".ui.activities.NumberWallPreview"
             android:exported="true"
             android:label="@string/number_wall_config" />
-        <activity android:name=".ui.activities.TimePickerPrefActivity"></activity>
-        <activity android:name=".ui.activities.DatabaseAdmin"
-            android:label="Database Admin"/>
-        <activity android:name=".ui.activities.ThinJamActivity"
+        <activity android:name=".ui.activities.TimePickerPrefActivity" />
+        <activity
+            android:name=".ui.activities.DatabaseAdmin"
+            android:label="Database Admin" />
+        <activity
+            android:name=".ui.activities.ThinJamActivity"
             android:configChanges="orientation|screenSize"
-            android:launchMode="singleTask"
-            android:label="BlueJay Admin"/>
-        <service android:name=".watch.thinjam.BlueJayService"
-            android:foregroundServiceType="connectedDevice|location"
-            />
+            android:label="BlueJay Admin"
+            android:launchMode="singleTask" />
+
+        <service
+            android:name=".watch.thinjam.BlueJayService"
+            android:foregroundServiceType="connectedDevice|location" />
         <service android:name=".cgm.webfollow.WebFollowService" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java b/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java
index 9351a4f59c..a99dc18d12 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/GcmListenerSvc.java
@@ -79,20 +79,22 @@ public static List<StatusItem> megaStatus() {
         return l;
     }
 
-    @Override
-    protected Intent zzD(Intent inteceptedIntent) {
+    // TODO probably needs alternate workaround for google play bug
+    /*@Override
+    protected Intent zzf(Intent interceptedIntent) {
         // intercept and fix google play services wakelocking bug
         try {
             if (!Pref.getBooleanDefaultFalse("excessive_wakelocks")) {
-                completeWakefulIntent(inteceptedIntent);
-                final Bundle extras = inteceptedIntent.getExtras();
+                completeWakefulIntent(interceptedIntent);
+                final Bundle extras = interceptedIntent.getExtras();
                 if (extras != null) extras.remove(EXTRA_WAKE_LOCK_ID);
             }
         } catch (Exception e) {
             UserError.Log.wtf(TAG, "Error patching play services: " + e);
         }
-        return super.zzD(inteceptedIntent);
-    }
+        return super.zzf(interceptedIntent);
+    }*/
+
 
     @Override
     public void onSendError(String msgID, Exception exception) {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
index deecc5334b..26c45508bc 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -115,6 +115,7 @@
 import com.eveningoutpost.dexdrip.UtilityModels.VoiceCommands;
 import com.eveningoutpost.dexdrip.calibrations.NativeCalibrationPipe;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
+import com.eveningoutpost.dexdrip.cloud.backup.BackupActivity;
 import com.eveningoutpost.dexdrip.dagger.Injectors;
 import com.eveningoutpost.dexdrip.databinding.ActivityHomeBinding;
 import com.eveningoutpost.dexdrip.databinding.ActivityHomeShelfSettingsBinding;
@@ -1117,6 +1118,10 @@ public static void startHomeWithExtra(Context context, String extra, String text
         context.startActivity(intent);
     }
 
+    public void cloudBackup(MenuItem x) {
+        JoH.startActivity(BackupActivity.class);
+    }
+
     public void crowdTranslate(MenuItem x) {
        // startActivity(new Intent(this, LanguageEditor.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://crowdin.com/project/xdrip")).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java
index a2ac1301d6..06661a8bb8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/LicenseAgreementActivity.java
@@ -2,23 +2,18 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.CheckBox;
 
 import com.eveningoutpost.dexdrip.Models.JoH;
-import com.eveningoutpost.dexdrip.Models.UserError;
-import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.oss.licenses.OssLicensesMenuActivity;
 
 
 public class LicenseAgreementActivity extends BaseAppCompatActivity {
     boolean IUnderstand;
-    boolean appended = false;
     CheckBox agreeCheckBox;
     Button saveButton;
     SharedPreferences prefs;
@@ -34,9 +29,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
             JoH.fixActionBar(this);
             findViewById(R.id.googlelicenses).setAlpha(0.5f);
-            agreeCheckBox = (CheckBox) findViewById(R.id.agreeCheckBox);
+            agreeCheckBox = findViewById(R.id.agreeCheckBox);
             agreeCheckBox.setChecked(IUnderstand);
-            saveButton = (Button) findViewById(R.id.saveButton);
+            saveButton = findViewById(R.id.saveButton);
             addListenerOnButton();
 
         } catch (UnsupportedOperationException e) {
@@ -54,28 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public void viewGoogleLicenses(View myview) {
-        try {
-            if (!appended) {
-                final String googleLicense = GoogleApiAvailability.getInstance().getOpenSourceSoftwareLicenseInfo(getApplicationContext());
-                if (googleLicense != null) {
-                    String whiteheader = "<font size=-2 color=white><pre>";
-                    String whitefooter = "</font></pre>";
-                    WebView textview = (WebView) findViewById(R.id.webView);
-                    textview.setBackgroundColor(Color.TRANSPARENT);
-                    textview.getSettings().setJavaScriptEnabled(false);
-                    textview.loadDataWithBaseURL("", whiteheader + googleLicense + whitefooter, "text/html", "UTF-8", "");
-                    appended = true;
-                    findViewById(R.id.googlelicenses).setVisibility(View.INVISIBLE);
-                    findViewById(R.id.webView).setVisibility(View.VISIBLE);
-
-                } else {
-                    UserError.Log.d(TAG, "Nullpointer getting Google License: errorcode:" + GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(getApplicationContext()));
-                    findViewById(R.id.googlelicenses).setVisibility(View.INVISIBLE);
-                }
-            }
-        } catch (Exception e) {
-            // meh
-        }
+        startActivity(new Intent(this, OssLicensesMenuActivity.class));
     }
 
     public void viewWarning(View myview) {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java b/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
index 5a8cd95766..ea089c8ff3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Services/DailyIntentService.java
@@ -22,6 +22,7 @@
 import com.eveningoutpost.dexdrip.UtilityModels.IncompatibleApps;
 import com.eveningoutpost.dexdrip.UtilityModels.Pref;
 import com.eveningoutpost.dexdrip.UtilityModels.UploaderQueue;
+import com.eveningoutpost.dexdrip.cloud.backup.Backup;
 import com.eveningoutpost.dexdrip.utils.DatabaseUtil;
 import com.eveningoutpost.dexdrip.utils.Telemetry;
 import com.eveningoutpost.dexdrip.wearintegration.WatchUpdaterService;
@@ -74,6 +75,12 @@ public static synchronized void work() {
                     }
                 }
 
+                try {
+                    Backup.doCompleteBackupIfEnabled();
+                } catch (Exception e) {
+                    UserError.Log.e(TAG, "Exception with Backup: " + e);
+                }
+
                 // prune old database records
 
                 try {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
index f8c874e38e..2b202fe16f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/Constants.java
@@ -53,6 +53,7 @@ public class Constants {
     public static final int MIBAND_SERVICE_RETRY_ID = 1026;
     public static final int MIBAND_SERVICE_BG_RETRY_ID = 1027;
     public static final int WEBFOLLOW_SERVICE_FAILOVER_ID = 1028;
+    public static final int BACKUP_ACTIVITY_ID = 1029;
 
     static final int NIGHTSCOUT_ERROR_NOTIFICATION_ID = 2001;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java
index 4577ec62ef..259d5d4515 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/VoiceCommands.java
@@ -18,6 +18,7 @@
 import com.eveningoutpost.dexdrip.Services.Ob1G5CollectionService;
 import com.eveningoutpost.dexdrip.Services.UiBasedCollector;
 import com.eveningoutpost.dexdrip.cgm.medtrum.MedtrumCollectionService;
+import com.eveningoutpost.dexdrip.cloud.backup.BackupActivity;
 import com.eveningoutpost.dexdrip.insulin.opennov.data.SaveCompleted;
 import com.eveningoutpost.dexdrip.profileeditor.BasalProfileEditor;
 import com.eveningoutpost.dexdrip.ui.activities.DatabaseAdmin;
@@ -88,6 +89,8 @@ public static void processVoiceCommand(final String allWords, final Activity mAc
         } else if (allWords.equals("test ui based collector")) {
             UiBasedCollector.switchToAndEnable(mActivity);
             JoH.static_toast_long("Enabling UI based collector");
+        } else if (allWords.equals("test cloud backup")) {
+            JoH.startActivity(BackupActivity.class);
         } else if (allWords.contentEquals("delete selected glucose meter") || allWords.contentEquals("delete selected glucose metre")) {
             Pref.setString("selected_bluetooth_meter_address", "");
         } else if (allWords.contentEquals("delete all finger stick data") || (allWords.contentEquals("delete all fingerstick data"))) {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/Backup.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/Backup.java
new file mode 100644
index 0000000000..ab0f55e814
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/Backup.java
@@ -0,0 +1,530 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+
+import static android.provider.OpenableColumns.DISPLAY_NAME;
+import static android.provider.OpenableColumns.SIZE;
+import static com.eveningoutpost.dexdrip.Models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.Models.JoH.getFieldFromURI;
+import static com.eveningoutpost.dexdrip.Models.JoH.getLocalBluetoothName;
+import static com.eveningoutpost.dexdrip.Models.JoH.hexStringToByteArray;
+import static com.eveningoutpost.dexdrip.Models.JoH.readLine;
+import static com.eveningoutpost.dexdrip.utils.SdcardImportExport.PREFERENCES_FILE;
+import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
+
+import android.net.Uri;
+import android.os.Build;
+import android.util.Pair;
+
+import com.activeandroid.Configuration;
+import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.R;
+import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.UtilityModels.PersistentStore;
+import com.eveningoutpost.dexdrip.UtilityModels.Pref;
+import com.eveningoutpost.dexdrip.utils.CipherUtils;
+import com.eveningoutpost.dexdrip.utils.SdcardImportExport;
+import com.eveningoutpost.dexdrip.xdrip;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.CipherOutputStream;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import lombok.val;
+
+/**
+ * JamOrHam
+ * Backup and Restore to Document URI such as google drive file location
+ * or using an xDrip managed Google Drive folder
+ */
+
+
+public class Backup {
+    private static final String TAG = "xDrip-Backup";
+    private static final String PREF_BACKUP_URI = "backup-document-uri";
+    public static final String PREF_AUTO_BACKUP = "backup-automatic-enabled";
+    private static final String XDRIP_CONTENT_TYPE = "xDripBackup://";
+    private static final String[] dbSuffix = {"-journal", "-shm", "-wal"};
+
+    public static boolean compressEncryptFilesToUri(final BackupStatus status, final String destinationUri, final String... sourcePaths) {
+        if (!emptyString(destinationUri)) {
+            try {
+                if (isXdripManagedUri(destinationUri)) {
+                    return compressEncryptFilesXdripStream(status, destinationUri, sourcePaths);
+                } else {
+                    try (val pfd = xdrip.getAppContext().getContentResolver()
+                            .openFileDescriptor(Uri.parse(destinationUri), "w")) {
+                        try (val outputStream = new FileOutputStream(pfd.getFileDescriptor())) {
+                            return compressEncryptFilesToOutputStream(outputStream, sourcePaths);
+                        }
+                    }
+                }
+            } catch (NullPointerException | IOException e) {
+                UserError.Log.e(TAG, "Output IO Error " + e);
+                status.status(xdrip.gs(R.string.output_error) + " " + e);
+            } catch (SecurityException e) {
+                UserError.Log.wtf(TAG, "Got weird security error: " + e);
+                status.status(xdrip.gs(R.string.security_error) + " " + e);
+            }
+            return false;
+        } else {
+            UserError.Log.d(TAG, "No destination specified");
+            return false;
+        }
+    }
+
+    public static boolean compressEncryptFilesToOutputStream(final OutputStream outputStream, final String... sourcePaths) {
+        try {
+            val metaData = new BackupMetaData();
+            metaData.sourceDevice = cleanPhoneName();
+            metaData.ob2 = CipherUtils.getRandomHexKey();
+            metaData.writeToOutputStream(outputStream);
+            try (val cipherOutputStream = new CipherOutputStream(outputStream, getCipher(true, metaData))) {
+                try (val gzipOutputStream = new GZIPOutputStream(cipherOutputStream)) {
+                    for (val sourcePath : sourcePaths) {
+                        pushFileToStreamWithHeader(sourcePath, gzipOutputStream);
+                    }
+                    gzipOutputStream.flush();
+                }
+                cipherOutputStream.flush();
+            }
+            outputStream.flush();
+            UserError.Log.d(TAG, "Data written successfully");
+            return true;
+        } catch (NullPointerException | IOException e) {
+            UserError.Log.e(TAG, "Output IO Error " + e);
+        } catch (SecurityException e) {
+            UserError.Log.wtf(TAG, "Got weird security error: " + e);
+        }
+        return false;
+    }
+
+    private static boolean isXdripManagedUri(final String uri) {
+        return uri != null && uri.startsWith(XDRIP_CONTENT_TYPE);
+    }
+
+    private static Pair<String, String> getIdNameFromXdripUri(final String uri) {
+        if (emptyString(uri)) return null;
+        val parts = uri.split("/");
+        if (parts.length != 4) {
+            UserError.Log.e(TAG, "Invalid parts length: " + parts.length);
+            return null;
+        }
+        return Pair.create(parts[2], parts[3]);
+    }
+
+    private static boolean compressEncryptFilesXdripStream(final BackupStatus status, final String uri, final String... sourcePaths) throws IOException {
+        val parts = getIdNameFromXdripUri(uri);
+        if (parts == null) {
+            UserError.Log.e(TAG, "Could not parse: " + uri);
+            status.status("Invalid file uri");
+            return false;
+        }
+        val temp = File.createTempFile("backup" + JoH.tsl(), "dat", xdrip.getAppContext().getCacheDir());
+        try {
+            status.status(xdrip.gs(R.string.creating_local_backup));
+            val fos = new FileOutputStream(temp);
+            val writeResult = compressEncryptFilesToOutputStream(fos, sourcePaths);
+            fos.close();
+            if (!writeResult) {
+                UserError.Log.e(TAG, "Failed to write backup to temporary file");
+                status.status(xdrip.gs(R.string.error_with_local_backup));
+                return false;
+            }
+            val fis = new FileInputStream(temp);
+            try {
+                status.status(xdrip.gs(R.string.uploading_to_cloud));
+                DriveManager.getInstance().saveFromStreamSync(parts.first, parts.second, fis); // TODO catch null
+                status.status(xdrip.gs(R.string.upload_successful));
+                return true;
+            } catch (NullPointerException e) {
+                UserError.Log.e(TAG, "Could not create drive service");
+                status.status(xdrip.gs(R.string.error_uploading_to_cloud));
+            }
+        } finally {
+            temp.delete();
+        }
+
+        return false;
+    }
+
+    private static boolean processXdripStream(final String sourceUri, final BackupMetaData metaData) throws IOException {
+        try {
+            val id = getIdNameFromXdripUri(sourceUri).first;
+            val fileMeta = DriveManager.getInstance().getFileInfo(id);
+            if (fileMeta == null) {
+                UserError.Log.e(TAG, "Cannot get file info for: " + sourceUri);
+                return false;
+            }
+            metaData.displayName = fileMeta.getName();
+            metaData.size = fileMeta.getSize();
+            try (val is = DriveManager.getInstance().getInputStream(id, metaData)) {
+                return restoreBackFromInputStream(is, metaData);
+            }
+        } catch (NullPointerException e) {
+            UserError.Log.e(TAG, "Null pointer from uri " + e);
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    private static BackupMetaData restoreBackFromDefaultUri(final boolean metaOnly) {
+        val metaData = new BackupMetaData();
+        metaData.getMetaDataOnly = metaOnly;
+        metaData.successResult = restoreBackFromUri(getBackupUri(), metaData);
+        return metaData;
+    }
+
+    public static BackupMetaData restoreBackFromDefaultUri() {
+        return restoreBackFromDefaultUri(false); // do full restore
+    }
+
+    public static BackupMetaData getBackupMetaDataDefaultUri() {
+        return restoreBackFromDefaultUri(true); // get metadata only
+    }
+
+
+    @SuppressWarnings("UnstableApiUsage")
+    public static synchronized boolean restoreBackFromUri(final String sourceUri, BackupMetaData metaData) {
+        if (metaData == null) {
+            metaData = new BackupMetaData();
+        }
+        if (!emptyString(sourceUri)) {
+            try {
+                if (isXdripManagedUri(sourceUri)) {
+                    return processXdripStream(sourceUri, metaData);
+                } else {
+                    val sourceURI = Uri.parse(sourceUri);
+                    populateMetaDataAsync(metaData, sourceURI);
+                    try (val pfd = xdrip.getAppContext().getContentResolver()
+                            .openFileDescriptor(sourceURI, "r")) {
+                        try (val inputStream = new FileInputStream(pfd.getFileDescriptor())) {
+                            return restoreBackFromInputStream(inputStream, metaData);
+                        }
+                    }
+                }
+            } catch (SecurityException e) {
+                UserError.Log.e(TAG, "Input IO Security Error " + e);
+                metaData.exception = e;
+                BackupActivity.notifySecurityError();
+            } catch (NullPointerException | IOException e) {
+                UserError.Log.e(TAG, "Input IO Error " + e);
+                metaData.exception = e;
+            }
+        } else {
+            UserError.Log.d(TAG, "No destination specified");
+            return false;
+        }
+        return false;
+    }
+
+    public static boolean restoreBackFromInputStream(final InputStream inputStream, final BackupMetaData metaData) throws IOException {
+        metaData.populateFromInputStream(inputStream);
+        if (metaData.getMetaDataOnly) {
+            UserError.Log.d(TAG, "Got metadata which is all that was requested");
+            return true;
+        }
+        if (metaData.looksOkay()) {
+            try (val cipherInputStream = new CipherInputStream(inputStream, getCipher(false, metaData))) {
+                try (val gzipInputStream = new GZIPInputStream(cipherInputStream)) {
+                    val completedFileList = new ArrayList<String>();
+                    while (pullFileFromStreamWithHeader(gzipInputStream, completedFileList)) {
+                        UserError.Log.d(TAG, "More data in stream...");
+                    }
+                    if (completedFileList.size() == 0) {
+                        UserError.Log.e(TAG, "Didn't get a single valid element");
+                        return false;
+                    } else {
+                        for (val file : completedFileList) {
+                            moveFileToFinalDestination(file);
+                        }
+                        Inevitable.task("kill all", 1000, SdcardImportExport::hardReset);
+                    }
+                }
+            }
+            return true;
+        } else {
+            UserError.Log.wtf(TAG, "Unrecognized backup type " + metaData.id);
+            return false;
+        }
+    }
+
+    public static void setXdripManagedBackupUri(final String fileId, final String name) {
+        if (fileId == null || name == null) {
+            UserError.Log.e(TAG, "Cannot set managed backup uri of null");
+            return;
+        }
+        setBackupUri(XDRIP_CONTENT_TYPE + fileId + "/" + name);
+    }
+
+    public static void setBackupUri(final String uri) {
+        PersistentStore.setString(PREF_BACKUP_URI, uri);
+    }
+
+    public static void clearBackupUri() {
+        setBackupUri("");
+    }
+
+    public static String getBackupUri() {
+        return PersistentStore.getString(PREF_BACKUP_URI);
+    }
+
+    public static boolean isBackupUriSet() {
+        return !emptyString(getBackupUri());
+    }
+
+    public static boolean isBackupSuitableForAutomatic() {
+        return isBackupUriSet() && isXdripManagedUri(getBackupUri());
+    }
+
+    public static void doCompleteBackupIfEnabled() {
+        if (Pref.getBooleanDefaultFalse(PREF_AUTO_BACKUP)
+                && isBackupSuitableForAutomatic()) {
+            UserError.Log.e(TAG, "Attempting automatic backup");
+            val success = doCompleteBackup(new LogStatus());
+            if (!success) {
+                UserError.Log.e(TAG, "Automatic backup failed");
+            }
+        }
+    }
+
+    public static boolean doCompleteBackup(final BackupStatus status) {
+        UserError.Log.d(TAG, "doCompleteBackup() called");
+        return compressEncryptFilesToUri(status, getBackupUri(), getPreferencesPath(), getDatabasePath());
+    }
+
+    public static String cleanPhoneName() {
+        String btName = getLocalBluetoothName();
+        if (btName.equalsIgnoreCase(Build.MODEL)) {
+            btName = "";
+        } else {
+            btName = "-" + btName;
+        }
+        return (Build.MODEL + btName)
+                .replace(" ", "-")
+                .replace("/", "-")
+                .replace(":", ".");
+    }
+
+    public static String getDefaultFileName() {
+        return "xdrip-backup-" + cleanPhoneName() + ".xdrip";
+    }
+
+    public static String getDefaultFolderName() {
+        return "xDrip-Backups";
+    }
+
+    private static String getDatabasePath() {
+        val databaseName = new Configuration.Builder(xdrip.getAppContext()).create().getDatabaseName();
+        return xdrip.getAppContext().getDatabasePath(databaseName).getPath();
+    }
+
+    private static String getPreferencesPath() {
+        return xdrip.getAppContext().getFilesDir().getParent() + "/" + PREFERENCES_FILE;
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private static void moveFileToFinalDestination(final String sourcePath) {
+
+        val s = new File(sourcePath);
+        UserError.Log.d(TAG, "Processing final destination: " + s.getName());
+        switch (s.getName()) {
+            case "com.eveningoutpost.dexdrip_preferences.xml":
+                moveIt(sourcePath, getPreferencesPath());
+                break;
+            case "DexDrip.db":
+                val dbpath = getDatabasePath();
+                moveIt(sourcePath, dbpath);
+                for (val suffix : dbSuffix) {
+                    new File(dbpath + suffix).delete();
+                }
+                break;
+            default:
+                UserError.Log.wtf(TAG, "Don't know how to move to destination for: " + s.getName());
+        }
+    }
+
+    private static boolean robustMove(final File source, final File dest) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                UserError.Log.d(TAG, "Using new move method " + source + " -> " + dest);
+                Files.move(source.toPath(), dest.toPath(), ATOMIC_MOVE);
+                return true;
+            } else {
+                val dr = source.renameTo(dest);
+                if (!dr) {
+                    UserError.Log.e(TAG, "Failed to move: " + source + " to " + dest);
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        } catch (UnsupportedOperationException | SecurityException | IOException e) {
+            UserError.Log.wtf(TAG, "Got exception trying to move files: " + source + " -> " + dest);
+        }
+        return false;
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private static boolean moveIt(final String sourcePath, final String destPath) {
+        try {
+            UserError.Log.d(TAG, "moveIt called " + sourcePath + " -> " + destPath);
+            val b = new File(destPath + ".xdripbak");
+            b.delete();     // delete any existing backup
+            val d = new File(destPath);
+            if (d.exists()) {
+                if (robustMove(d, b)) {
+                    if (!b.exists()) {
+                        UserError.Log.e(TAG, "Backup reportedly made but doesn't exist - skipping");
+                        return false;
+                    }
+                } else {
+                    UserError.Log.e(TAG, "Failed to make backup file " + b.getName());
+                    return false;
+                }
+            } else {
+                UserError.Log.d(TAG, "Not backing up " + d.getName() + " as it doesn't exist");
+            }
+            val s = new File(sourcePath);
+            val sr = robustMove(s, d);
+            if (!sr) {
+                UserError.Log.e(TAG, "Failed to move " + s.getName() + " to " + d.getName() + " - restoring backup");
+                val br = robustMove(b, d);
+                if (!br) {
+                    UserError.Log.wtf(TAG, "Failed to restore backup before overwrite!");
+                }
+                return false;
+            }
+
+            UserError.Log.d(TAG, "moveIt success");
+            return true;
+        } catch (SecurityException e) {
+            UserError.Log.wtf(TAG, "Move failed due to security exception: " + e);
+        }
+        return false;
+    }
+
+    private static void populateMetaDataAsync(final BackupMetaData metaData, final Uri sourceURI) {
+        JoH.runOnUiThread(() -> {
+            try {
+                metaData.size = Long.parseLong(getFieldFromURI(SIZE, sourceURI));
+            } catch (Exception e) {
+                UserError.Log.e(TAG, "Could not get size " + e);
+            }
+            try {
+                metaData.displayName = getFieldFromURI(DISPLAY_NAME, sourceURI);
+            } catch (Exception e) {
+                UserError.Log.e(TAG, "Could not get display name " + e);
+            }
+        });
+    }
+
+    private static void pushFileToStreamWithHeader(final String sourcePath, final OutputStream outputStream) {
+        try {
+            val file = new File(sourcePath);
+            if (file.exists()) {
+                try (val input = new FileInputStream(file)) {
+                    UserError.Log.d(TAG, "Saving: " + sourcePath + " (" + file.length() + ")");
+
+                    outputStream.write((file.getName() + "\n").getBytes(StandardCharsets.UTF_8));
+                    outputStream.write((file.length() + "\n").getBytes(StandardCharsets.UTF_8));
+
+                    final byte[] buffer = new byte[1024 * 1024];
+                    int bytes_read;
+                    while ((bytes_read = input.read(buffer)) != -1) {
+                        UserError.Log.d(TAG, "Writing buffer bytes: " + bytes_read);
+                        outputStream.write(buffer, 0, bytes_read);
+                    }
+                }
+            } else {
+                UserError.Log.wtf(TAG, "Cannot find file to backup: " + sourcePath);
+            }
+        } catch (IOException e) {
+            UserError.Log.wtf(TAG, "Error reading input file: " + e);
+        }
+    }
+
+    private static boolean pullFileFromStreamWithHeader(final InputStream inputStream, final List<String> completedFileList) {
+        try {
+            val filename = readLine(inputStream);
+            if (filename == null) return false;
+            val sizes = readLine(inputStream);
+            if (sizes == null) return false;
+            long size = Long.parseLong(sizes);
+
+            if (size > 1024 * 1024 * 500) {
+                UserError.Log.wtf(TAG, "Can't process files > 500MB !");
+                return false;
+            }
+
+            UserError.Log.d(TAG, "Found file: " + filename + " size: " + sizes);
+
+            val outputDir = xdrip.getAppContext().getFilesDir().getAbsolutePath();
+            val outputFile = new File(outputDir, filename);
+            UserError.Log.d(TAG, "Writing to: " + outputFile.getAbsolutePath());
+            val outputStream = new FileOutputStream(outputFile);
+
+            final byte[] buffer = new byte[1024 * 1024];
+            long bytes_total = 0;
+            int bytes_read;
+            while (((bytes_read = inputStream.read(buffer, 0, (int) Math.min(size - bytes_total, buffer.length))) != -1) && bytes_total < size) {
+                bytes_total += bytes_read;
+                outputStream.write(buffer, 0, bytes_read);
+                // UserError.Log.d(TAG, "Reading buffer bytes: " + bytes_read);
+            }
+
+            outputStream.close();
+
+            if (bytes_total == size) {
+                UserError.Log.d(TAG, "Correct loading of file size: " + bytes_total);
+                completedFileList.add(outputFile.getPath());
+                return true;
+
+            } else {
+                UserError.Log.wtf(TAG, "Invalid file size for: " + filename + " " + bytes_total + " instead of " + size);
+                outputFile.delete();
+                return false;
+            }
+
+        } catch (NumberFormatException | NullPointerException | IOException e) {
+            UserError.Log.wtf(TAG, "Error reading data: " + e);
+        }
+        return false;
+    }
+
+
+    private static Cipher getCipher(final boolean encrypt, final BackupMetaData metaData) {
+        try {
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            val randomKey = new SecretKeySpec(hexStringToByteArray(metaData.OB1), "AES");
+            cipher.init(encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE, randomKey, new IvParameterSpec(hexStringToByteArray(metaData.ob2)));
+            return cipher;
+        } catch (InvalidKeyException | InvalidAlgorithmParameterException | NoSuchPaddingException | NoSuchAlgorithmException e) {
+            UserError.Log.wtf(TAG, "Error getting cipher: " + e);
+            return null;
+        }
+    }
+
+}
+
+
+
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupActivity.java
new file mode 100644
index 0000000000..3e85124b6a
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupActivity.java
@@ -0,0 +1,324 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+import static com.eveningoutpost.dexdrip.Models.JoH.showNotification;
+import static com.eveningoutpost.dexdrip.UtilityModels.Constants.BACKUP_ACTIVITY_ID;
+import static com.eveningoutpost.dexdrip.cloud.backup.Backup.cleanPhoneName;
+import static com.eveningoutpost.dexdrip.cloud.backup.Backup.isBackupSuitableForAutomatic;
+import static com.eveningoutpost.dexdrip.cloud.backup.DriveManager.BINARY_FILE_TYPE;
+
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.databinding.ObservableArrayMap;
+import android.databinding.ObservableField;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.R;
+import com.eveningoutpost.dexdrip.UtilityModels.Inevitable;
+import com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl;
+import com.eveningoutpost.dexdrip.databinding.ActivityBackupPickerBinding;
+import com.eveningoutpost.dexdrip.ui.dialog.GenericConfirmDialog;
+import com.eveningoutpost.dexdrip.xdrip;
+import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException;
+
+import java.io.IOException;
+
+import lombok.val;
+
+/**
+ * JamOrHam
+ * Storage Access Framework and xDrip Drive Manager based backup system
+ */
+
+@SuppressWarnings("ConstantConditions")
+public class BackupActivity extends BackupBaseActivity implements BackupStatus {
+
+    private static final int REQUEST_CODE_CHOOSE_FILE = 2008;
+    private static final String TAG = BackupActivity.class.getSimpleName();
+
+    private ActivityBackupPickerBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityBackupPickerBinding.inflate(getLayoutInflater());
+        binding.setVm(new ViewModel());
+        binding.setMap(binding.getVm().map);
+        binding.setPrefs(new PrefsViewImpl());
+        setContentView(binding.getRoot());
+        JoH.fixActionBar(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        binding.getVm().readMetaData();
+
+    }
+
+    void selectAutomaticFile() {
+        // If we are already signed in, give user option to change account/reset permissions
+        if (isSignedIn() && hasNeededPermissions()) {
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+                    .setTitle(R.string.change_google_account)
+                    .setMessage("Automatic management appears to already be active.\nDo you want to change google account used with this feature?");
+
+            builder.setNegativeButton(R.string.keep_same_account, (dialog, which) -> selectAutomaticFileReal());
+            builder.setPositiveButton(R.string.change_account, (dialog, which) -> {
+                binding.getVm().clear();
+                signOut(this::selectAutomaticFileReal);
+            });
+
+            final AlertDialog dialog = builder.create();
+            try {
+                if (dialog.isShowing()) {
+                    dialog.dismiss();
+                }
+            } catch (Exception e) {
+                //
+            }
+            dialog.show();
+
+        } else {
+            selectAutomaticFileReal();
+        }
+    }
+
+    void selectAutomaticFileReal() {
+        isSignedInSignIn(() -> checkForGooglePermissions(() -> Inevitable.task("selectAutomaticFile", 100, () -> {
+            try {
+                UserError.Log.d(TAG, "Trying to get or make file");
+                val file = DriveManager.getInstance().getOrCreateFileSync(Backup.getDefaultFolderName() + "/" + Backup.getDefaultFileName());
+                UserError.Log.d(TAG, "Auto file: " + file.getName() + " " + file.getId());
+                Backup.setXdripManagedBackupUri(file.getId(), file.getName());
+                binding.getVm().readMetaData();
+            } catch (NullPointerException | IOException e) {
+                UserError.Log.e(TAG, "Failed creating file: " + e);
+                if (e instanceof UserRecoverableAuthIOException) {
+                    if (JoH.ratelimit("automatic-file-real-user-exception", 30)) {
+                        runAfterOk = this::selectAutomaticFileReal; // retry
+                        startActivityForResult(((UserRecoverableAuthIOException) e).getIntent(), REQUEST_CODE_PERMISSIONS);
+                    }
+                } else {
+                    status(e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        })));
+    }
+
+    void selectFile(final boolean create) {
+        val fileIntent = new Intent(create ? Intent.ACTION_CREATE_DOCUMENT : Intent.ACTION_OPEN_DOCUMENT);
+        fileIntent.addCategory(Intent.CATEGORY_OPENABLE);
+        fileIntent.setType(BINARY_FILE_TYPE);
+        fileIntent.putExtra(Intent.EXTRA_TITLE, Backup.getDefaultFileName());
+        startActivityForResult(Intent.createChooser(fileIntent, getString(R.string.select_alternate_file)), REQUEST_CODE_CHOOSE_FILE);
+    }
+
+
+    public class ViewModel {
+
+        public final ObservableField<String> status = new ObservableField<>("Ready");
+        public final ObservableField<Boolean> idle = new ObservableField<>(true);
+        public final ObservableField<Boolean> showAuto = new ObservableField<>(false);
+        public final ObservableArrayMap<String, String> map = new ObservableArrayMap<>();
+
+        private BackupMetaData metaData = null;
+
+        {
+            clear();
+        }
+
+        public void clear() {
+            final String[] texts = {"lastBackupTime", "lastAgoTime", "lastDevice", "selectedLocation", "stext"};
+            for (val text : texts) {
+                map.put(text, "");
+            }
+        }
+
+        private void map(final String varname, final String name, final String value) {
+            map.put(varname, value);
+            map.put(varname + "String", name);
+        }
+
+        public void selectFile() {
+            val t = BackupActivity.this;
+            final AlertDialog.Builder builder = new AlertDialog.Builder(t)
+                    .setTitle(R.string.choose_backup_file)
+                    .setMessage(R.string.select_automatic_or_select_alternate);
+
+            builder.setNegativeButton(R.string.use_alternate_file, (dialog, which) -> t.selectFile(false));
+            builder.setPositiveButton(R.string.automatically_manage_backup, (dialog, which) -> selectAutomaticFile());
+
+            final AlertDialog dialog = builder.create();
+            try {
+                if (dialog.isShowing()) {
+                    dialog.dismiss();
+                }
+            } catch (Exception e) {
+                //
+            }
+            dialog.show();
+        }
+
+        public void backupNow() {
+            if (idle.get()) {
+                if (Backup.isBackupUriSet()) {
+                    idle.set(false);
+                    Inevitable.task("do backup", 200, () -> {
+                        try {
+                            status(getString(R.string.backing_up));
+                            val success = Backup.doCompleteBackup(BackupActivity.this);
+                            if (success) {
+                                status(getString(R.string.did_backup_ok));
+                            } else {
+                                status(getString(R.string.backup_failed));
+                            }
+                            Inevitable.task("reload meta data", 2000, () -> binding.getVm().readMetaData());
+                        } finally {
+                            idle.set(true);
+                        }
+                    });
+                } else {
+                    status(getString(R.string.no_backup_location_set));
+                }
+            }
+        }
+
+        public synchronized void restoreNow() {
+            if (!Backup.isBackupUriSet() || metaData == null) {
+                status(getString(R.string.nothing_to_restore_please_select));
+            } else {
+                Runnable restoreRunnable = () -> GenericConfirmDialog.show(BackupActivity.this, getString(R.string.are_you_really_sure_question), getString(R.string.restoring_backup_will_erase_warning), () -> restoreNowReal());
+                if (metaData.sourceDevice.equals(cleanPhoneName())) {
+                    restoreRunnable.run();
+                } else {
+                    GenericConfirmDialog.show(BackupActivity.this, getString(R.string.backup_source_confirm), getString(R.string.this_backup_looks_like_came_from_different_format_string, metaData.sourceDevice), restoreRunnable);
+                }
+            }
+        }
+
+        private synchronized void restoreNowReal() {
+            if (idle.get()) {
+                idle.set(false);
+                status(getString(R.string.attempting_restore));
+                Inevitable.task("do backup", 200, () -> {
+                    try {
+                        val metaData = Backup.restoreBackFromDefaultUri();
+                        status(metaData.successResult ? getString(R.string.restore_succeeded_restarting) : getString(R.string.restore_failed));
+                        if (metaData.exception != null) {
+                            status(getString(R.string.error_exclamation) + " " + metaData.exception);
+                        }
+                    } finally {
+                        idle.set(true);
+                    }
+                });
+            }
+        }
+
+        public void readMetaData() {
+            showAuto.set(isBackupSuitableForAutomatic());
+            if (Backup.isBackupUriSet()) {
+                if (idle.get()) {
+                    idle.set(false);
+                    Inevitable.task("read backup meta data", 100, () -> {
+                        try {
+                            status(getString(R.string.checking_file));
+                            metaData = Backup.getBackupMetaDataDefaultUri();
+                            if (metaData.successResult) {
+                                map("lastBackupTime", "Last backup time", metaData.getTimeStampString());
+                                map("lastAgoTime", "Last backup was", metaData.getTimeSinceString());
+                                map("lastDevice", "Backup made by", metaData.sourceDevice);
+                                map("selectedLocation", "Selected location", metaData.displayName);
+                                map("stext", "Backup size", getString(R.string.megabyte_format_string, metaData.getSizeInMb()));
+                                status(getString(R.string.ready));
+                            } else {
+                                status(getString(R.string.failed_to_read_file) + ((metaData.exception != null && metaData.exception.getMessage() != null) ? (": " + metaData.exception.getMessage()) : ""));
+                                if (metaData.exception != null && metaData.exception instanceof UserRecoverableAuthIOException) {
+                                    // if permissions lost ask again
+                                    if (JoH.ratelimit("reask-backup-perms", 20)) {
+                                        status(getString(R.string.permission_problem_retry));
+                                        startActivityForResult(((UserRecoverableAuthIOException) metaData.exception).getIntent(), REQUEST_CODE_PERMISSIONS);
+                                    } else {
+                                        if (JoH.ratelimit("reask-try-signout", 30)) {
+                                            clear();
+                                            signOut(() -> checkForGooglePermissions(() -> selectAutomaticFileReal()));
+                                        }
+                                    }
+                                }
+                            }
+
+                        } finally {
+                            idle.set(true);
+                        }
+                    });
+                }
+            } else {
+                UserError.Log.d(TAG, "No URI set to read metadata from");
+            }
+        }
+    }
+
+    @Override
+    public void status(final String msg) {
+        binding.getVm().status.set(msg);
+        UserError.Log.d(TAG, "Status: " + msg);
+    }
+
+    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_CHOOSE_FILE) {
+            if (data != null) {
+                final Uri selectedFileUri = data.getData();
+                try {
+                    UserError.Log.d(TAG, "URL: " + selectedFileUri);
+                    if (isOnGDrive(selectedFileUri)) {
+                        GenericConfirmDialog.show(this, getString(R.string.temporary_google_drive_file), getString(R.string.manual_selection_google_drive_file_warning), () -> useNewUri(selectedFileUri));
+                    } else {
+                        GenericConfirmDialog.show(this, getString(R.string.alternate_file_selected), getString(R.string.alternate_file_selected_warning), () -> useNewUri(selectedFileUri));
+                    }
+
+                } catch (Exception e) {
+                    JoH.static_toast_long(getString(R.string.problem_with_file_selection) + " " + e.getMessage());
+                }
+            } else {
+                status(getString(R.string.no_file_was_chosen));
+            }
+        }
+        if (requestCode == REQUEST_CODE_SIGN_IN && resultCode != RESULT_OK) {
+            status(getString(R.string.could_not_sign_in));
+        }
+    }
+
+    private boolean isOnGDrive(final Uri selectedFileUri) {
+        switch (selectedFileUri.getAuthority()) {
+            case "com.google.android.apps.docs.storage":
+            case "com.google.android.apps.docs.storage.legacy":
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void useNewUri(final Uri selectedFileUri) {
+        getContentResolver().takePersistableUriPermission(selectedFileUri,
+                Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        val fileUri = selectedFileUri.toString();
+        Backup.setBackupUri(fileUri);
+        status(getString(R.string.selected_file_location));
+        binding.getVm().readMetaData();
+    }
+
+    static PendingIntent getStartIntent() {
+        return PendingIntent.getActivity(xdrip.getAppContext(), 0, new Intent(xdrip.getAppContext(), BackupActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+    static void notifySecurityError() {
+        if (JoH.pratelimit("backup-security-notification-n", 60 * 60 * 12)) {
+            showNotification(xdrip.gs(R.string.please_reselect_backup_file), xdrip.gs(R.string.backup_file_security_error_advice), getStartIntent(), BACKUP_ACTIVITY_ID, true, true, true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupBaseActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupBaseActivity.java
new file mode 100644
index 0000000000..a83be65848
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupBaseActivity.java
@@ -0,0 +1,154 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+
+import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.R;
+import com.google.android.gms.auth.api.signin.GoogleSignIn;
+import com.google.android.gms.auth.api.signin.GoogleSignInClient;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.common.Scopes;
+import com.google.android.gms.common.api.Scope;
+
+import lombok.val;
+
+/**
+ * JamOrHam
+ * Base Activity for Google Drive backup
+ */
+
+public abstract class BackupBaseActivity extends AppCompatActivity {
+
+    private static final String TAG = BackupBaseActivity.class.getSimpleName();
+
+    protected static final int REQUEST_CODE_SIGN_IN = 6000;
+    protected static final int REQUEST_CODE_PERMISSIONS = 4005;
+
+    protected final Scope SCOPE_FILE = new Scope(Scopes.DRIVE_FILE);
+    protected final Scope SCOPE_EMAIL = new Scope(Scopes.EMAIL); // have to request or account access doesn't work
+
+    protected Runnable runAfterSignIn = null;
+    protected Runnable runAfterOk = null;
+
+
+    @Override
+    protected synchronized void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_SIGN_IN) {
+            UserError.Log.i(TAG, "Received sign in result code: " + resultCode);
+            if (resultCode == RESULT_OK) {
+                UserError.Log.i(TAG, "Signed in successfully.");
+                processRunnable();
+            } else {
+                UserError.Log.w(TAG, "Unable to sign in, result code: " + resultCode);
+            }
+        }
+        if (requestCode == REQUEST_CODE_PERMISSIONS) {
+            if (resultCode == RESULT_OK) {
+                UserError.Log.d(TAG, "Authorization result ok");
+                if (runAfterOk != null) {
+                    UserError.Log.d(TAG, "Running runnable after authorization ok");
+                    runAfterOk.run();
+                    runAfterOk = null;
+                }
+            }
+        }
+    }
+
+    public boolean isSignedInSignIn(final Runnable runAfterSignIn) {
+        if (!isSignedIn()) {
+            this.runAfterSignIn = runAfterSignIn;
+            signIn(true);
+            return false;
+        } else {
+            if (runAfterSignIn != null) {
+                UserError.Log.d(TAG, "Running runnable immediately as already signed in");
+                runAfterSignIn.run();
+            }
+            return true;
+        }
+    }
+
+    public boolean isSignedIn() {
+        val signInAccount = GoogleSignIn.getLastSignedInAccount(this);
+        return (signInAccount != null
+                && signInAccount.getGrantedScopes().contains(SCOPE_FILE)
+                && signInAccount.getGrantedScopes().contains(SCOPE_EMAIL));
+    }
+
+    private synchronized void processRunnable() {
+        if (runAfterSignIn != null) {
+            UserError.Log.d(TAG, "Processing runnable");
+            runAfterSignIn.run();
+            runAfterSignIn = null;
+        }
+    }
+
+    private void signIn(boolean dialog) {
+        if (isSignedIn()) {
+            UserError.Log.d(TAG, "Already signed in...");
+            return;
+        }
+
+        UserError.Log.i(TAG, "Start sign-in.");
+        val mGoogleSignInClient = getGoogleSignInClient();
+        mGoogleSignInClient.silentSignIn()
+                .addOnSuccessListener(googleSignInAccount -> {
+                    UserError.Log.d(TAG, "Silent sign-in worked");
+                    processRunnable();
+                }).addOnFailureListener(e -> {
+            UserError.Log.d(TAG, "Silent sign-in failed");
+            if (dialog) {
+                startActivityForResult(
+                        mGoogleSignInClient.getSignInIntent(), REQUEST_CODE_SIGN_IN);
+            }
+        });
+    }
+
+    protected GoogleSignInClient getGoogleSignInClient() {
+        GoogleSignInOptions signInOptions =
+                new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                        .requestScopes(SCOPE_FILE, SCOPE_EMAIL)
+                        .build();
+        return GoogleSignIn.getClient(this, signInOptions);
+    }
+
+    protected void signOut(final Runnable runnable) {
+        Backup.clearBackupUri();
+        DriveManager.deleteInstance();
+        getGoogleSignInClient().revokeAccess()
+                .addOnCompleteListener(task -> getGoogleSignInClient().signOut()
+                        .addOnCompleteListener(task1 -> {
+                            if (runnable != null) {
+                                runnable.run();
+                            }
+                        }));
+    }
+
+    protected boolean hasNeededPermissions() {
+        return GoogleSignIn.hasPermissions(
+                GoogleSignIn.getLastSignedInAccount(getApplicationContext()),
+                SCOPE_FILE, SCOPE_EMAIL);
+    }
+
+    protected void checkForGooglePermissions(final Runnable runAfterOk) {
+        if (!hasNeededPermissions()) {
+            this.runAfterOk = runAfterOk;
+            JoH.show_ok_dialog(this, getString(R.string.please_grant_permission),
+                    getString(R.string.drive_permission_blurb),
+                    () -> GoogleSignIn.requestPermissions(
+                            BackupBaseActivity.this,
+                            REQUEST_CODE_PERMISSIONS,
+                            GoogleSignIn.getLastSignedInAccount(getApplicationContext()),
+                            SCOPE_FILE, SCOPE_EMAIL));
+        } else {
+            if (runAfterOk != null) {
+                UserError.Log.d(TAG, "Running after permission check immediately");
+                runAfterOk.run();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupMetaData.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupMetaData.java
new file mode 100644
index 0000000000..f75a5a2e1d
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupMetaData.java
@@ -0,0 +1,98 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+
+import static com.eveningoutpost.dexdrip.Models.JoH.readLine;
+import static com.eveningoutpost.dexdrip.Models.JoH.roundDouble;
+import static com.eveningoutpost.dexdrip.xdrip.gs;
+
+import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.R;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+
+/**
+ * JamOrHam
+ * Backup file header metadata data and handler class
+ */
+
+public class BackupMetaData {
+
+    private static final String title = "xDrip";
+    private static final String type = "backup";
+    private static final int version = 1;
+    final String OB1 = "5861bdb93f5ba8effa43c8ff7f26c3be";
+    static final String ID = String.format(Locale.US, "%s-%s-v%d", title, type, version);
+
+    public volatile String id;
+    public volatile String timestamp;
+    public volatile String sourceDevice;
+    public volatile String ob2;
+    public volatile String exp3;
+    public volatile String exp4;
+    public volatile Exception exception;
+    public volatile String displayName;
+    public volatile long size;
+    public volatile boolean getMetaDataOnly;
+    public volatile boolean successResult;
+
+    public boolean populateFromInputStream(final InputStream inputStream) {
+        id = readLine(inputStream);
+        timestamp = readLine(inputStream);
+        sourceDevice = readLine(inputStream);
+        ob2 = readLine(inputStream);
+        exp3 = readLine(inputStream);
+        exp4 = readLine(inputStream);
+        return true;
+    }
+
+    public boolean writeToOutputStream(final OutputStream outputStream) {
+        try {
+            timestamp = "" + JoH.tsl();
+            id = ID;
+            writeString(id, outputStream);
+            writeString(timestamp, outputStream);
+            writeString(sourceDevice, outputStream);
+            writeString(ob2, outputStream);
+            writeString(exp3, outputStream);
+            writeString(exp4, outputStream);
+        } catch (IOException e) {
+            exception = e;
+            return false;
+        }
+        return true;
+    }
+
+    private void writeString(final String string, final OutputStream outputStream) throws IOException {
+        outputStream.write(((string != null ? string : "") + "\n").getBytes(StandardCharsets.UTF_8));
+    }
+
+    // Todo i18n
+    public String getTimeStampString() {
+        try {
+            return timestamp != null ? JoH.dateTimeText(Long.parseLong(timestamp)) : gs(R.string.none);
+        } catch (Exception e) {
+            return gs(R.string.invalid_time);
+        }
+    }
+
+    public String getTimeSinceString() {
+        try {
+            return timestamp != null ? gs(R.string.format_string_ago, JoH.niceTimeScalar(JoH.msSince(Long.parseLong(timestamp)))) : "";
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    public double getSizeInMb() {
+        return roundDouble(size / (1024*1024d),2);
+    }
+
+    public boolean looksOkay() {
+        return id != null && id.equals(ID);
+    }
+
+}
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupStatus.java
new file mode 100644
index 0000000000..21cd1a1852
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/BackupStatus.java
@@ -0,0 +1,11 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+/**
+ * JamOrHam
+ * Interface for backup status updates
+ */
+
+public interface BackupStatus {
+
+    void status(String msg);
+}
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/DriveManager.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/DriveManager.java
new file mode 100644
index 0000000000..5907e2d273
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/DriveManager.java
@@ -0,0 +1,174 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+import android.support.annotation.Nullable;
+
+import com.eveningoutpost.dexdrip.Models.JoH;
+import com.eveningoutpost.dexdrip.Models.UserError;
+import com.eveningoutpost.dexdrip.xdrip;
+import com.google.android.gms.auth.api.signin.GoogleSignIn;
+import com.google.android.gms.common.Scopes;
+import com.google.api.client.extensions.android.http.AndroidHttp;
+import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
+import com.google.api.client.http.InputStreamContent;
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.api.services.drive.Drive;
+import com.google.api.services.drive.model.File;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+
+import lombok.val;
+
+/**
+ * JamOrHam
+ * Google Drive Manager
+ * Provides various utility methods and manages its own lifecycle
+ * Methods must be called off the main thread.
+ */
+
+public class DriveManager {
+
+    private static final String TAG = DriveManager.class.getSimpleName();
+    private static final String DRIVE_FOLDER_TYPE = "application/vnd.google-apps.folder";
+    public static final String BINARY_FILE_TYPE = "application/octet-stream";
+    private static DriveManager instance = null;
+    private final Drive mDriveService;
+
+    public DriveManager(Drive driveService) {
+        mDriveService = driveService;
+    }
+
+    public synchronized static void deleteInstance() {
+        UserError.Log.d(TAG, "Deleting instance");
+        instance = null;
+    }
+
+    public synchronized static DriveManager getInstance() {
+        if (instance == null) {
+            val lastAccount = GoogleSignIn.getLastSignedInAccount(xdrip.getAppContext());
+            if (lastAccount == null) {
+                UserError.Log.wtf(TAG, "lastAccount is null");
+            } else {
+                val credential = GoogleAccountCredential.usingOAuth2(
+                        xdrip.getAppContext(), Collections.singletonList(Scopes.DRIVE_FILE));
+                val account = lastAccount.getAccount();
+                if (account == null) {
+                    UserError.Log.wtf(TAG, "Account is null!!");
+                } else {
+                    credential.setSelectedAccount(account);
+                    val googleDriveService =
+                            new Drive.Builder(
+                                    AndroidHttp.newCompatibleTransport(),
+                                    new GsonFactory(), credential)
+                                    .setApplicationName("Nightscout xDrip+")
+                                    .build();
+                    instance = new DriveManager(googleDriveService);
+                }
+            }
+        }
+        return instance;
+    }
+
+    public void saveFromStreamSync(final String fileId, final String name, final InputStream inputStream) throws IOException {
+        val metadata = new File().setName(name);
+        mDriveService.files().update(fileId, metadata, new InputStreamContent(BINARY_FILE_TYPE, inputStream)).execute();
+    }
+
+    public InputStream getInputStream(final String fileId, final BackupMetaData metaData) throws IOException {
+        val file = mDriveService.files().get(fileId);
+        val rangeLimit = 10000;
+        if (metaData.getMetaDataOnly && metaData.size > rangeLimit) {
+            file.getRequestHeaders().setRange("bytes=0-" + rangeLimit);
+        }
+        return file.executeMediaAsInputStream();
+    }
+
+    public File getFileInfo(final String fileId) throws IOException {
+        return mDriveService.files().get(fileId)
+                .setFields("*")
+                .execute();
+    }
+
+    public File findFolderSync(final String name) throws IOException {
+        val results = mDriveService.files().list()
+                .setSpaces("drive").execute();
+        if (results.getIncompleteSearch()) {
+            UserError.Log.e(TAG, "Incomplete folder search");
+        }
+        for (val result : results.getFiles()) {
+            if (result.getMimeType().equals(DRIVE_FOLDER_TYPE)
+                    && result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    public File findFileSync(final String name) throws IOException {        // TODO order by modified?
+        val results = mDriveService.files().list()
+                .setOrderBy("modifiedTime desc")
+                .setSpaces("drive").execute();
+        if (results.getIncompleteSearch()) {
+            UserError.Log.wtf(TAG, "Incomplete file search - please report error");
+        }
+        for (val result : results.getFiles()) {
+            if (!result.getMimeType().equals(DRIVE_FOLDER_TYPE)
+                    && result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    public File getOrCreateFolderSync(final String name) throws IOException {
+        val folder = findFolderSync(name);
+        if (folder == null) {
+            return createFolderSync(name, null);
+        } else {
+            return folder;
+        }
+    }
+
+    public File getOrCreateFileSync(final String path) throws IOException {
+        if (JoH.emptyString(path)) {
+            UserError.Log.e(TAG, "Empty path in getOrCreate");
+            return null;
+        }
+        val parts = path.split("/");
+        if (parts.length != 2) {
+            UserError.Log.e(TAG, "Invalid path in getOrCreate: " + path);
+            return null;
+        }
+        val filename = parts[parts.length - 1];
+        val existing = findFileSync(filename);
+        if (existing != null) {
+            return existing;
+        } else {
+            val folder = parts[parts.length - 2];
+            UserError.Log.d(TAG, "Creating: " + filename + " in " + folder);
+            val folderResult = getOrCreateFolderSync(folder);
+            val metadata = new File()
+                    .setParents(Collections.singletonList(folderResult.getId()))
+                    .setMimeType(BINARY_FILE_TYPE)
+                    .setName(filename);
+            return mDriveService.files().create(metadata).execute();
+        }
+    }
+
+    public File createFolderSync(final String folderName, @Nullable final String parentFolderId) throws IOException {
+        final List<String> root = parentFolderId == null ? Collections.singletonList("root")
+                : Collections.singletonList(parentFolderId);
+        val metadata = new File()
+                .setParents(root)
+                .setMimeType(DRIVE_FOLDER_TYPE)
+                .setName(folderName);
+        val file = mDriveService.files().create(metadata).execute();
+        if (file == null) {
+            throw new IOException("Null result when requesting file creation.");
+        }
+        return file;
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/LogStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/LogStatus.java
new file mode 100644
index 0000000000..f066838f31
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/LogStatus.java
@@ -0,0 +1,12 @@
+package com.eveningoutpost.dexdrip.cloud.backup;
+
+import com.eveningoutpost.dexdrip.Models.UserError;
+
+public class LogStatus implements BackupStatus {
+    private static final String TAG = "Backup";
+
+    @Override
+    public void status(String msg) {
+        UserError.Log.e(TAG, "Status: " + msg);      // TODO reduce log priority in production
+    }
+}
diff --git a/app/src/main/res/layout/activity_backup_picker.xml b/app/src/main/res/layout/activity_backup_picker.xml
new file mode 100644
index 0000000000..7a112b6f56
--- /dev/null
+++ b/app/src/main/res/layout/activity_backup_picker.xml
@@ -0,0 +1,115 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.eveningoutpost.dexdrip.cloud.backup.BackupActivity.ViewModel" />
+
+        <import type="android.databinding.ObservableMap" />
+
+        <variable
+            name="map"
+            type="ObservableMap&lt;String, String&gt;" />
+
+        <variable
+            name="prefs"
+            type="com.eveningoutpost.dexdrip.UtilityModels.PrefsViewImpl" />
+
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:gravity="center"
+                android:text="@string/you_can_use_google_drive_for_backup"
+                android:textColor="#fff9c4"
+                android:textSize="17sp" />
+
+            <include
+                layout="@layout/bound_status_item"
+                app:name="@{map.selectedLocationString}"
+                app:value="@{map.selectedLocation}" />
+
+            <include
+                layout="@layout/bound_status_item"
+                app:name="@{map.stextString}"
+                app:value="@{map.stext}" />
+
+            <include
+                layout="@layout/bound_status_item"
+                app:name="@{map.lastBackupTimeString}"
+                app:value="@{map.lastBackupTime}" />
+
+            <include
+                layout="@layout/bound_status_item"
+                app:name="@{map.lastAgoTimeString}"
+                app:value="@{map.lastAgoTime}" />
+
+            <include
+                layout="@layout/bound_status_item"
+                app:name="@{map.lastDeviceString}"
+                app:value="@{map.lastDevice}" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:gravity="center"
+                android:text="@{vm.status, default=`Status`}"
+                android:textColor="#fff9c4"
+                android:textSize="17sp" />
+
+            <ProgressBar
+                style="?android:attr/progressBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:invisibleIfFalse="@{!vm.idle}" />
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:enabled="@{vm.idle}"
+                android:onClick="@{() -> vm.selectFile()}"
+                android:text="@string/select_backup_location" />
+
+            <Button
+                android:id="@+id/button30"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:enabled="@{vm.idle}"
+                android:onClick="@{() -> vm.backupNow()}"
+                android:text="@string/do_backup_now" />
+
+            <CheckBox
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/automatic_daily_backup"
+                app:checked="@={prefs[`backup-automatic-enabled`]}"
+                app:showIfTrueAnimatedFastOff="@{vm.showAuto}" />
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:enabled="@{vm.idle}"
+                android:onClick="@{() -> vm.restoreNow()}"
+                android:text="@string/restore_from_backup" />
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bound_status_item.xml b/app/src/main/res/layout/bound_status_item.xml
new file mode 100644
index 0000000000..b826d6f571
--- /dev/null
+++ b/app/src/main/res/layout/bound_status_item.xml
@@ -0,0 +1,64 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="name"
+            type="String" />
+
+        <variable
+            name="value"
+            type="String" />
+
+    </data>
+<LinearLayout
+    android:orientation="vertical"
+    app:showIfTrueAnimatedFastOff="@{value.length() > 0}"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp">
+
+        <TextView
+
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="end"
+            android:paddingRight="5dp"
+            android:text="@{name}"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="5dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:gravity="center_horizontal"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:text=":"
+            android:textSize="14sp" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="start"
+            android:paddingLeft="5dp"
+            android:text="@{value}"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider" />
+
+</LinearLayout>
+</layout>
diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml
index 47ac497a70..097d7e1c2f 100644
--- a/app/src/main/res/menu/menu_home.xml
+++ b/app/src/main/res/menu/menu_home.xml
@@ -29,6 +29,15 @@
         android:orderInCategory="1">
 
         <menu>
+
+            <item
+                android:id="@+id/cloud_backup"
+                android:title="@string/cloud_backup"
+                android:checkable="false"
+                android:orderInCategory="1"
+                android:onClick="cloudBackup"
+                android:showAsAction="never"/>
+
     <item android:id="@+id/action_export_database"
         android:title="@string/menu_export_database"
         android:checkable="false"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5192a5b70d..8aaabf4faa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1719,4 +1719,58 @@
     <string name="select_tone_for_alerts">Select tone for Alerts</string>
     <string name="show_unsmoothed">Show unsmoothed</string>
     <string name="show_unsmoothed_summary">Show unsmoothed data also if Graph Smoothing is enabled. If calibration plugin is used, will show unsmoothed data instead of plugin data.</string>
+    <string name="you_can_use_google_drive_for_backup">You can use Google Drive for backup</string>
+    <string name="select_backup_location">Select Backup Location</string>
+    <string name="do_backup_now">Do Backup Now</string>
+    <string name="automatic_daily_backup">Automatic daily backup</string>
+    <string name="restore_from_backup">Restore From Backup</string>
+    <string name="are_you_really_sure_question">Are you really sure?</string>
+    <string name="backup_source_confirm">Backup Source Confirm</string>
+    <string name="nothing_to_restore_please_select">Nothing to restore - please select location</string>
+    <string name="no_backup_location_set">No backup location set</string>
+    <string name="backing_up">Backing up</string>
+    <string name="did_backup_ok">Did backup ok</string>
+    <string name="backup_failed">Backup failed</string>
+    <string name="automatically_manage_backup">Automatically Manage</string>
+    <string name="use_alternate_file">Use Alternate File</string>
+    <string name="choose_backup_file">Choose backup file</string>
+    <string name="select_alternate_file">Select alternate file</string>
+    <string name="change_account">Change account</string>
+    <string name="keep_same_account">Keep same account</string>
+    <string name="change_google_account">Change Google Account</string>
+    <string name="attempting_restore">Attempting Restore</string>
+    <string name="restore_succeeded_restarting">Restore succeeded - restarting app</string>
+    <string name="restore_failed">Restore FAILED!</string>
+    <string name="error_exclamation">Error!</string>
+    <string name="checking_file">Checking file</string>
+    <string name="failed_to_read_file">Failed to read file</string>
+    <string name="permission_problem_retry">Permission problem - retry</string>
+    <string name="alternate_file_selected">Alternate file selected</string>
+    <string name="temporary_google_drive_file">Temporary Google Drive file</string>
+    <string name="no_file_was_chosen">No file was chosen</string>
+    <string name="could_not_sign_in">Could not sign in</string>
+    <string name="problem_with_file_selection">Problem with file selection</string>
+    <string name="selected_file_location">Selected file location</string>
+    <string name="please_reselect_backup_file">Please re-select backup file</string>
+    <string name="ready">Ready</string>
+    <string name="uploading_to_cloud">Uploading to cloud</string>
+    <string name="error_with_local_backup">Error with local backup</string>
+    <string name="upload_successful">Upload successful</string>
+    <string name="error_uploading_to_cloud">Error uploading to cloud</string>
+    <string name="creating_local_backup">Creating local backup</string>
+    <string name="output_error">Output error:</string>
+    <string name="security_error">Security error:</string>
+    <string name="please_grant_permission">Please grant permission</string>
+    <string name="drive_permission_blurb">To automatically back-up xDrip needs permission to use your Google Drive.\n\nxDrip developers cannot access any of your files or see your personal information.</string>
+    <string name="cloud_backup">Cloud Backup</string>
+    <string name="select_automatic_or_select_alternate">Select Automatic for xDrip to manage files in Google Drive or select an alternate specific file to use if you need to restore from elsewhere.</string>
+    <string name="restoring_backup_will_erase_warning">Restoring a backup will erase your current settings and data with that from the backup.\n\nAre you absolutely sure you wish to do this?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">This backup looks like it came from a different device:\n%s\nAre you sure you wish to restore from this backup?</string>
+    <string name="megabyte_format_string">%.1f MB</string>
+    <string name="manual_selection_google_drive_file_warning">You have selected a file from Google Drive, but this is not automatically managed by xDrip so it can only be used for manual backups and restoring.\n\nNo automatic backing up will occur with this file.\n\nContinue?</string>
+    <string name="alternate_file_selected_warning">You have selected an alternate file. Typically this would just be to restore from a locally stored backup.\n\nNo automatic backing up will occur with this file.\n\nContinue?</string>
+    <string name="backup_file_security_error_advice">Backup file is reporting security error. Normally this means you have to re-select it to continue to allow xDrip access.</string>
+    <string name="invalid_time">Invalid time</string>
+    <string name="none">none</string>
+    <string name="format_string_ago">%s ago</string>
 </resources>
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/ui/TranslationTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/ui/TranslationTest.java
index ea1bf3fc7c..c47827f51e 100644
--- a/app/src/test/java/com/eveningoutpost/dexdrip/ui/TranslationTest.java
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/ui/TranslationTest.java
@@ -1,6 +1,7 @@
 package com.eveningoutpost.dexdrip.ui;
 
 
+import static com.eveningoutpost.dexdrip.xdrip.gs;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static java.nio.file.FileVisitResult.CONTINUE;
 
@@ -83,7 +84,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e) {
 
             try {
                 // check minutes ago days
-                fmt = xdrip.gs(R.string.minutes_ago);
+                fmt = gs(R.string.minutes_ago);
                 result = MessageFormat.format(fmt, 123);
                 assertWithMessage("minutes_ago choice message format failed to contain value").that(result).contains("123");
             } catch (IllegalArgumentException e) {
@@ -93,13 +94,17 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e) {
 
             try {
                 // check expires days
-                fmt = xdrip.gs(R.string.expires_days);
+                fmt = gs(R.string.expires_days);
                 result = MessageFormat.format(fmt, 123.4f);
                 assertWithMessage("expires_days choice message format failed to contain value").that(result).contains("123.4");
             } catch (IllegalArgumentException e) {
                 restoreLocale();
                 throw new RuntimeException("Failed expires days test with language " + language + " with exception: " + e);
             }
+
+            assertWithMessage("megabyte format " + language).that(gs(R.string.megabyte_format_string)).contains("%.1f");
+            assertWithMessage("time format " + language).that(gs(R.string.format_string_ago)).contains("%s");
+
         }
 
         restoreLocale();
diff --git a/build.gradle b/build.gradle
index b572814565..a37aa7c7c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.4.3'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.github.jamorham:ReplaceTokenPreprocessor:1.5'
+        classpath 'com.google.android.gms:oss-licenses-plugin:0.9.5'
 
         apply plugin: 'java'
         apply plugin: 'maven'

From 539c4d903a3008ca91391b64e4536f64d9069010 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:22 +0100
Subject: [PATCH 41/52] New translations strings.xml (Turkish)

---
 app/src/main/res/values-tr/strings-tr.xml | 54 +++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/app/src/main/res/values-tr/strings-tr.xml b/app/src/main/res/values-tr/strings-tr.xml
index a98480da86..910b08c16c 100644
--- a/app/src/main/res/values-tr/strings-tr.xml
+++ b/app/src/main/res/values-tr/strings-tr.xml
@@ -1670,4 +1670,58 @@
     <string name="select_tone_for_alerts">Uyarılar için ton seçin</string>
     <string name="show_unsmoothed">Pürüzlü verileri göster</string>
     <string name="show_unsmoothed_summary">Grafik yumuşatma etkinleştirilse bile pürüzlü verileri de gösterir. Kalibrasyon eklentisi kullanılıyorsa, eklenti verileri yerine pürüzlü verileri gösterecektir.</string>
+    <string name="you_can_use_google_drive_for_backup">Yedekleme için Google Drive\'ı kullanabilirsiniz</string>
+    <string name="select_backup_location">Yedekleme Konumunu Seçin</string>
+    <string name="do_backup_now">Şimdi Yedekle</string>
+    <string name="automatic_daily_backup">Günlük otomatik yedekleme</string>
+    <string name="restore_from_backup">Yedekten geri yükle</string>
+    <string name="are_you_really_sure_question">Gerçekten emin misiniz?</string>
+    <string name="backup_source_confirm">Yedekleme Kaynağı Onaylayın</string>
+    <string name="nothing_to_restore_please_select">Geri yüklenecek bir şey yok - lütfen konum seçin</string>
+    <string name="no_backup_location_set">Yedekleme konumu ayarlanmadı</string>
+    <string name="backing_up">Yedekleniyor</string>
+    <string name="did_backup_ok">Yedekleme yaptı mı</string>
+    <string name="backup_failed">Yedekleme başarısız</string>
+    <string name="automatically_manage_backup">Otomatik Yönet</string>
+    <string name="use_alternate_file">Alternatif Dosya Kullan</string>
+    <string name="choose_backup_file">Yedekleme dosyasını seçin</string>
+    <string name="select_alternate_file">Alternatif dosya seçin</string>
+    <string name="change_account">Hesap Değiştir</string>
+    <string name="keep_same_account">Aynı hesabı tut</string>
+    <string name="change_google_account">Google Hesabını Değiştir</string>
+    <string name="attempting_restore">Geri Yüklemeye Çalışılıyor</string>
+    <string name="restore_succeeded_restarting">Geri yükleme başarılı - uygulama yeniden başlatılıyor</string>
+    <string name="restore_failed">Geri yükleme BAŞARISIZ oldu!</string>
+    <string name="error_exclamation">Hata!</string>
+    <string name="checking_file">Dosya kontrol ediliyor</string>
+    <string name="failed_to_read_file">Dosya okunamadı</string>
+    <string name="permission_problem_retry">İzin sorunu - yeniden deneyin</string>
+    <string name="alternate_file_selected">Alternatif dosya seçildi</string>
+    <string name="temporary_google_drive_file">Geçici Google Drive dosyası</string>
+    <string name="no_file_was_chosen">Herhangi bir dosya seçilmedi</string>
+    <string name="could_not_sign_in">Oturum açamadı</string>
+    <string name="problem_with_file_selection">Dosya seçimi ile ilgili sorun</string>
+    <string name="selected_file_location">Seçilen dosya konumu</string>
+    <string name="please_reselect_backup_file">Lütfen tekrar yedekleme dosyasını seçin</string>
+    <string name="ready">Hazır</string>
+    <string name="uploading_to_cloud">Buluta gönderiliyor</string>
+    <string name="error_with_local_backup">Yerel yedekleme ile ilgili hata</string>
+    <string name="upload_successful">Yükleme Başarılı</string>
+    <string name="error_uploading_to_cloud">Buluta yüklenirken hata oluştu</string>
+    <string name="creating_local_backup">Yerel yedekleme oluşturuluyor</string>
+    <string name="output_error">Çıktı hatası:</string>
+    <string name="security_error">Güvenlik hatası:</string>
+    <string name="please_grant_permission">Lütfen izin ver</string>
+    <string name="drive_permission_blurb">xDrip\'in otomatik olarak yedeklenmesi için Google Drive\'ınızı kullanma izni gerekir.\n\nxDrip geliştiricileri dosyalarınızın hiçbirine erişemez veya kişisel bilgilerinizi göremez.</string>
+    <string name="cloud_backup">Bulut yedekleme</string>
+    <string name="select_automatic_or_select_alternate">Google Drive\'daki dosyaları yönetmek için xDrip için Otomatik\'i seçin veya başka bir yerden geri yüklemeniz gerekiyorsa kullanmak üzere belirli bir alternatif dosya seçin.</string>
+    <string name="restoring_backup_will_erase_warning">Bir yedeği geri yüklemek, mevcut ayarlarınızı ve bununla ilgili verilerinizi yedekten siler.\n\nBunu yapmak istediğinizden kesinlikle emin misiniz?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">Bu yedekleme, farklı bir cihazdan gelmiş gibi görünüyor:\n%s\nBu yedeklemeden geri yüklemek istediğinizden emin misiniz?</string>
+    <string name="megabyte_format_string">%.1f MB</string>
+    <string name="manual_selection_google_drive_file_warning">Google Drive\'dan bir dosya seçtiniz, ancak bu, xDrip tarafından otomatik olarak yönetilmediğinden, yalnızca manuel yedekleme ve geri yükleme için kullanılabilir.\n\nBu dosyayla otomatik yedekleme yapılmayacaktır.\n\nDevam edilsin mi?</string>
+    <string name="alternate_file_selected_warning">Alternatif bir dosya seçtiniz. Genellikle bu yalnızca yerel olarak depolanan bir yedekten geri yüklemek olacaktır.\n\nBu dosyayla otomatik yedekleme yapılmayacaktır.\n\nDevam edilsin mi?</string>
+    <string name="backup_file_security_error_advice">Yedek dosya güvenlik hatası bildiriyor. Normalde bu, xDrip erişimine izin vermeye devam etmek için tekrar seçmeniz gerektiği anlamına gelir.</string>
+    <string name="invalid_time">Geçersiz süre</string>
+    <string name="none">hiçbiri</string>
+    <string name="format_string_ago">%s önce</string>
 </resources>

From f9cc53152072895f0aa6fab7c92edf2bf79015db Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:24 +0100
Subject: [PATCH 42/52] New translations strings.xml (Swedish)

---
 app/src/main/res/values-sv/strings-sv.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/res/values-sv/strings-sv.xml b/app/src/main/res/values-sv/strings-sv.xml
index 2b2fff250c..4f3b971aa1 100644
--- a/app/src/main/res/values-sv/strings-sv.xml
+++ b/app/src/main/res/values-sv/strings-sv.xml
@@ -1121,4 +1121,19 @@
     <string name="select_tone_for_alerts">Välj ljud för Larm</string>
     <string name="show_unsmoothed">Visa ej-utjämnad</string>
     <string name="show_unsmoothed_summary">Visa icke-utjämnad data om också Grafutjämning är aktiverad. Om kalibreringsplugin används, kommer icke-utjämnade data visas istället för plugindata.</string>
+    <string name="you_can_use_google_drive_for_backup">Du kan använda Google Drive för backup</string>
+    <string name="select_backup_location">Välj backup plats</string>
+    <string name="do_backup_now">Genomför backup nu</string>
+    <string name="automatic_daily_backup">Automatiska dagliga backuper</string>
+    <string name="restore_from_backup">Återställ från backup</string>
+    <string name="are_you_really_sure_question">Är du verkligen säker?</string>
+    <string name="backup_source_confirm">Bekräfta backupkälla</string>
+    <string name="nothing_to_restore_please_select">Inget att återställa - vänligen välj plats</string>
+    <string name="no_backup_location_set">Inge backupplats vald</string>
+    <string name="backing_up">Backar upp</string>
+    <string name="did_backup_ok">Genomförde backup ok</string>
+    <string name="backup_failed">Misslyckad backup</string>
+    <string name="automatically_manage_backup">Hantera automatiskt</string>
+    <string name="use_alternate_file">Använd alternativ fil</string>
+    <string name="choose_backup_file">Välj en backupfil</string>
 </resources>

From 2d511966e098c876c3d740832c981575890b3b92 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:32 +0100
Subject: [PATCH 43/52] New translations strings.xml (Estonian)

---
 app/src/main/res/values-et/strings-et.xml | 60 ++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-et/strings-et.xml b/app/src/main/res/values-et/strings-et.xml
index 467357e832..aa7e29360e 100644
--- a/app/src/main/res/values-et/strings-et.xml
+++ b/app/src/main/res/values-et/strings-et.xml
@@ -1665,8 +1665,64 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Lihtsusta graafikuid, siludes ebakorrapärasusi</string>
     <string name="graph_smoothing">Graafiku silumine</string>
     <string name="last_reading">Viimane näit</string>
-    <string name="select_file_for_alert">Vali fail Alarmi jaoks</string>
+    <string name="select_file_for_alert">Vali fail hoiatuste jaoks</string>
     <string name="cannot_choose_file_without_permission">Ilma salvestamise loata ei saa faili valida</string>
     <string name="select_time">Vali aeg</string>
-    <string name="select_tone_for_alerts">Vali helin alarmi jaoks</string>
+    <string name="select_tone_for_alerts">Vali hoiatuste helin</string>
+    <string name="show_unsmoothed">Näita silumata</string>
+    <string name="show_unsmoothed_summary">Kuva silumata andmed ka siis kui graafiku silumine on lubatud. Kui kasutada kalibreerimist, kuvatakse töödeldud andmete asemel silumata andmed.</string>
+    <string name="you_can_use_google_drive_for_backup">Varukoopia saab teha Google Drive\'i</string>
+    <string name="select_backup_location">Vali varukoopia asukoht</string>
+    <string name="do_backup_now">Loo varukoopia nüüd</string>
+    <string name="automatic_daily_backup">Automaatne varukoopia</string>
+    <string name="restore_from_backup">Taastamine varukoopiast</string>
+    <string name="are_you_really_sure_question">Oled täiesti kindel?</string>
+    <string name="backup_source_confirm">Varukoopia allika kinnitamine</string>
+    <string name="nothing_to_restore_please_select">Midagi pole taastada – vali asukoht</string>
+    <string name="no_backup_location_set">Varukoopia asukoht määramata</string>
+    <string name="backing_up">Varundamine...</string>
+    <string name="did_backup_ok">Varundamine oli ok</string>
+    <string name="backup_failed">Varundamine nurjus</string>
+    <string name="automatically_manage_backup">Automaatne haldamine</string>
+    <string name="use_alternate_file">Kasuta alternatiivset faili</string>
+    <string name="choose_backup_file">Vali varukoopia fail</string>
+    <string name="select_alternate_file">Vali alternatiivne fail</string>
+    <string name="change_account">Muuda kasutajakontot</string>
+    <string name="keep_same_account">Kasuta sama kasutajakontot</string>
+    <string name="change_google_account">Muuda Google\'i kontot</string>
+    <string name="attempting_restore">Taastamise katse</string>
+    <string name="restore_succeeded_restarting">Taastamine ok – rakenduse taaskäivitus</string>
+    <string name="restore_failed">Taastamine EBAÕNNESTUS!</string>
+    <string name="error_exclamation">Viga!</string>
+    <string name="checking_file">Kontrollin faili</string>
+    <string name="failed_to_read_file">Faili lugemine nurjus</string>
+    <string name="permission_problem_retry">Probleem loaga – proovi uuesti</string>
+    <string name="alternate_file_selected">Valitud alternatiivne fail</string>
+    <string name="temporary_google_drive_file">Ajutine Google Drive\'i fail</string>
+    <string name="no_file_was_chosen">Faili pole valitud</string>
+    <string name="could_not_sign_in">Ei saanud sisse logida</string>
+    <string name="problem_with_file_selection">Probleem failivalikuga</string>
+    <string name="selected_file_location">Valitud faili asukoht</string>
+    <string name="please_reselect_backup_file">Vali varukoopia fail uuesti</string>
+    <string name="ready">Valmis</string>
+    <string name="uploading_to_cloud">Üleslaadimine pilve</string>
+    <string name="error_with_local_backup">Viga kohaliku varundamisega</string>
+    <string name="upload_successful">Üleslaadimine õnnestus</string>
+    <string name="error_uploading_to_cloud">Üleslaadimine pilve ebaõnnestus</string>
+    <string name="creating_local_backup">Kohaliku varukoopia loomine</string>
+    <string name="output_error">Väljundi viga:</string>
+    <string name="security_error">Turvaviga:</string>
+    <string name="please_grant_permission">Palun kinnita luba</string>
+    <string name="drive_permission_blurb">Automaatseks varundamiseks vajab xDrip teie Google Drive\'i kasutamiseks luba.\n\nxDripi arendajad ei pääse juurde teie failile ega näe teie isiklikku teavet.</string>
+    <string name="cloud_backup">Varundamine pilve</string>
+    <string name="select_automatic_or_select_alternate">Vali xDrip\'i jaoks automaatne viis, et hallata faile Google Drive\'is, või valige alternatiivne konkreetne fail, mida kasutada, kui peate mujalt taastama.</string>
+    <string name="restoring_backup_will_erase_warning">Varukoopiast taastamine kustutab teie praegused seaded ja andmed.\n\nKas oled täiesti kindel, et soovid seda teha?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">See varukoopia näib olevat pärit teisest seadmest:\n%s\nKas soovid kindlasti sellest varukoopiast taastada?</string>
+    <string name="megabyte_format_string">%.1f MB</string>
+    <string name="manual_selection_google_drive_file_warning">Valisid Google Drive\'ist faili, kuid seda ei halda xDrip automaatselt, nii et seda saab kasutada ainult käsitsi varundamiseks ja taastamiseks.\n\nSelle failiga ei tehta automaatset varundust.\n\nKas jätkata?</string>
+    <string name="alternate_file_selected_warning">Oled valinud alternatiivse faili. Tavaliselt on see lihtsalt kohalikust salvestatud varukoopiast taastamine.\n\nSelle failiga automaatset varundamist ei toimu.\n\nKas jätkata?</string>
+    <string name="backup_file_security_error_advice">Varukoopia fail teatab turvaveast. Tavaliselt tähendab see, et xDrip\'i juurdepääsu lubamise jätkamiseks peate faili uuesti valima.</string>
+    <string name="invalid_time">Ebaõige aeg</string>
+    <string name="none">ei midagi</string>
+    <string name="format_string_ago">%s tagasi</string>
 </resources>

From daf817f9b216a56b4389d61823b123f19661fdb8 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:35 +0100
Subject: [PATCH 44/52] New translations strings.xml (Hungarian)

---
 app/src/main/res/values-hu/strings-hu.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/res/values-hu/strings-hu.xml b/app/src/main/res/values-hu/strings-hu.xml
index 395af835ed..a4736c81b5 100644
--- a/app/src/main/res/values-hu/strings-hu.xml
+++ b/app/src/main/res/values-hu/strings-hu.xml
@@ -1619,4 +1619,16 @@
     <string name="cannot_choose_file_without_permission">Tárhelyengedély nélkül nem nyithat meg fájlokat</string>
     <string name="select_time">Időpont kiválasztása</string>
     <string name="select_tone_for_alerts">Válassza ki a riasztás hangját</string>
+    <string name="you_can_use_google_drive_for_backup">Használhatja a Google Drive-ot a biztonsági mentéshez</string>
+    <string name="select_backup_location">Biztonsági mentés helye</string>
+    <string name="do_backup_now">Biztonsági mentés készítése</string>
+    <string name="automatic_daily_backup">Automatikus biztonsági mentés naponta</string>
+    <string name="restore_from_backup">Visszaállítás biztonsági mentésből</string>
+    <string name="are_you_really_sure_question">Biztos vagy benne?</string>
+    <string name="backup_source_confirm">Biztonsági mentés forrásának megerősítése</string>
+    <string name="nothing_to_restore_please_select">Nincs mit helyreállítani - kérjük, válassza ki a forrást</string>
+    <string name="no_backup_location_set">Nincs megadva a biztonsági mentés helye</string>
+    <string name="backing_up">Biztonsági mentés</string>
+    <string name="did_backup_ok">Biztonsági mentés kész</string>
+    <string name="backup_failed">Biztonsági mentés meghiúsult</string>
 </resources>

From 2d78e040a42e4f4308f73405b6e0dfc335f1d15d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:41 +0100
Subject: [PATCH 45/52] New translations strings.xml (German)

---
 app/src/main/res/values-de/strings-de.xml | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/app/src/main/res/values-de/strings-de.xml b/app/src/main/res/values-de/strings-de.xml
index a601543e94..884fe3bedc 100644
--- a/app/src/main/res/values-de/strings-de.xml
+++ b/app/src/main/res/values-de/strings-de.xml
@@ -1619,4 +1619,31 @@
     <string name="graph_smoothing">Glättung der grafischen Darstellung</string>
     <string name="last_reading">Letzte Werte</string>
     <string name="cannot_choose_file_without_permission">Kann Datei nicht auswählen ohne Speichermedium-Berechtigungen</string>
+    <string name="you_can_use_google_drive_for_backup">Sie können Google Drive als Backup Laufwerk verwenden</string>
+    <string name="select_backup_location">Backup Laufwerk auswählen</string>
+    <string name="do_backup_now">Erstellen Sie jetzt ein Backup</string>
+    <string name="automatic_daily_backup">Tägliches automatisches Backup</string>
+    <string name="restore_from_backup">Vom Backup widerherstellen</string>
+    <string name="are_you_really_sure_question">Wollen Sie das wirklich?</string>
+    <string name="backup_source_confirm">Backup Quelle bestätigen</string>
+    <string name="nothing_to_restore_please_select">Nichts zum widerherstellen gefunden - wählen Sie erneut</string>
+    <string name="no_backup_location_set">Kein Backupverzeichnis ausgewählt</string>
+    <string name="backing_up">Sicherung läuft</string>
+    <string name="did_backup_ok">Backup wurde durchgeführt</string>
+    <string name="backup_failed">Backup fehlgeschlagen</string>
+    <string name="automatically_manage_backup">Backup automatisch durchführen</string>
+    <string name="use_alternate_file">Benutzen Sie einen anderen Dateinamen</string>
+    <string name="choose_backup_file">Wählen Sie eine Backup Dabei aus</string>
+    <string name="select_alternate_file">Wählen Sie ein anderes Backup</string>
+    <string name="change_account">Account wechseln</string>
+    <string name="keep_same_account">Selben Account benutzen</string>
+    <string name="change_google_account">Ändern Sie den Google Account</string>
+    <string name="attempting_restore">Wiederherstellen</string>
+    <string name="restore_succeeded_restarting">Wiederherstellung er folgreich - App wird neu gestartet</string>
+    <string name="restore_failed">Wiederherstellung fehlgeschlagen!</string>
+    <string name="error_exclamation">Fehler!</string>
+    <string name="checking_file">Überprüfen Sie die Datei</string>
+    <string name="failed_to_read_file">Datei konnte nicht gelesen werden</string>
+    <string name="permission_problem_retry">Probleme mit der Berechtigung - Erneut versuchen</string>
+    <string name="alternate_file_selected">Alternative Dabei ausgewählt</string>
 </resources>

From e306b051bcfb12bbc04aaaab5457c1e45292aa48 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:43 +0100
Subject: [PATCH 46/52] New translations strings.xml (Bulgarian)

---
 app/src/main/res/values-bg/strings-bg.xml | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/app/src/main/res/values-bg/strings-bg.xml b/app/src/main/res/values-bg/strings-bg.xml
index cead12f3e3..0ef7fb8fed 100644
--- a/app/src/main/res/values-bg/strings-bg.xml
+++ b/app/src/main/res/values-bg/strings-bg.xml
@@ -459,4 +459,54 @@
     <string name="simplify_graphs_by_smoothing_out_irregularities">Опрости графики като изглажда нередни данни</string>
     <string name="graph_smoothing">Изглаждане на графика</string>
     <string name="last_reading">Последно замерено</string>
+    <string name="you_can_use_google_drive_for_backup">Можете да използвате Google Drive за бакъп</string>
+    <string name="select_backup_location">Избери локация за бакъп</string>
+    <string name="do_backup_now">Направи бакъп сега</string>
+    <string name="automatic_daily_backup">Автоматичен дневен бакъп</string>
+    <string name="restore_from_backup">Възстанови от бакъп</string>
+    <string name="are_you_really_sure_question">Сигурни ли сте?</string>
+    <string name="backup_source_confirm">Бакъп източник потвърден</string>
+    <string name="nothing_to_restore_please_select">Няма какво да се възстанови - изберете локация</string>
+    <string name="no_backup_location_set">Не е избрана бакъп локация</string>
+    <string name="backing_up">Архивиране...</string>
+    <string name="did_backup_ok">Направен бакъп ок</string>
+    <string name="backup_failed">Бакъп неуспешен</string>
+    <string name="automatically_manage_backup">Автоматично управление</string>
+    <string name="use_alternate_file">Използване алтернативен файл</string>
+    <string name="choose_backup_file">Избери бакъп файл</string>
+    <string name="select_alternate_file">Изберил алтернативен файл</string>
+    <string name="change_account">Смени акаунт</string>
+    <string name="keep_same_account">Запази същия акаунт</string>
+    <string name="change_google_account">Смени Google акаунт</string>
+    <string name="attempting_restore">Опит за възстановяване</string>
+    <string name="restore_succeeded_restarting">Възстановяването успешно - рестартиране прил.</string>
+    <string name="restore_failed">Възстановяването НЕУСПЕШНО!</string>
+    <string name="error_exclamation">Грешка!</string>
+    <string name="checking_file">Проверяване на файла</string>
+    <string name="failed_to_read_file">Неусшено прочитане на файла</string>
+    <string name="permission_problem_retry">Проблем с достъп - опитай пак</string>
+    <string name="alternate_file_selected">Алтернативен файл избран</string>
+    <string name="temporary_google_drive_file">Временен Google Drive файл</string>
+    <string name="no_file_was_chosen">Не е избран файл</string>
+    <string name="could_not_sign_in">Неусешно вписване</string>
+    <string name="problem_with_file_selection">Проблем при избиране на файл</string>
+    <string name="selected_file_location">Избери локация на файл</string>
+    <string name="please_reselect_backup_file">Моля изберете отново архивния файл</string>
+    <string name="ready">Готов</string>
+    <string name="uploading_to_cloud">Качване в облака</string>
+    <string name="error_with_local_backup">Грешка в локален бакъп</string>
+    <string name="upload_successful">Качването успешно</string>
+    <string name="error_uploading_to_cloud">Грешка при качването в облака</string>
+    <string name="creating_local_backup">Създаване локален бакъп</string>
+    <string name="output_error">Изходяща грешка:</string>
+    <string name="security_error">Сигурност грешка:</string>
+    <string name="please_grant_permission">Моля дайте права</string>
+    <string name="drive_permission_blurb">За да можете автоматично да направите бакъп на xDrip е нужндо да дадете права за достъп до Google drive.\n\nxDrip разработчиците не могат и няма да достъпят вашите файлове или лична информация.</string>
+    <string name="cloud_backup">Обалчен бакъп</string>
+    <string name="select_automatic_or_select_alternate">Избиранет xDrip автоматично да управлява файлвое в Google Drive или изберете алтернативен файл, ако ви е нужно да възстановите настройки.</string>
+    <string name="restoring_backup_will_erase_warning">Възстановяване на бакъп, ще изтрие всички сегашни настройки и данни.\n\n Абсолютно сигурни ли сте, че искате това?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">Изглежда бакъпът е от друго устройство:\n%s\nСигурни ли сте, че искате да продължите?</string>
+    <string name="megabyte_format_string">%.1f мегабайт</string>
+    <string name="manual_selection_google_drive_file_warning">Вие сте избрали файл от Google drive, но той не се управлява автоматично от xDrip, така че може да се използва само за ръчен баък и възстановяване.\n\nНяма да имате автоматичен бакъп с този файл.\n\nПродължавате ли?</string>
+    <string name="alternate_file_selected_warning">Избрали сте алтернативен файл. Обикновено това, ще е възстановяване от локален файл.\n\nНяма да имате автоматичен бакъп с този файл.\n\nПродължавате ли?</string>
 </resources>

From c2b4036005159fe48dd4ab66387e5bcf44993d5b Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:48 +0100
Subject: [PATCH 47/52] New translations strings.xml (Polish)

---
 app/src/main/res/values-pl/strings-pl.xml | 40 +++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/app/src/main/res/values-pl/strings-pl.xml b/app/src/main/res/values-pl/strings-pl.xml
index 52a3bc2bc6..b8193569d1 100644
--- a/app/src/main/res/values-pl/strings-pl.xml
+++ b/app/src/main/res/values-pl/strings-pl.xml
@@ -1578,4 +1578,44 @@
     <string name="select_tone_for_alerts">Wybierz dźwięk dla alarmów</string>
     <string name="show_unsmoothed">Pokaż niewygładzone</string>
     <string name="show_unsmoothed_summary">Pokaż niewygładzone dane również, jeśli wygładzanie wykresu jest włączone. Jeśli używana jest wtyczka kalibracyjna, pokaże niewygładzone dane zamiast danych wtyczki.</string>
+    <string name="you_can_use_google_drive_for_backup">Możesz użyć Dysku Google do tworzenia kopii zapasowej</string>
+    <string name="select_backup_location">Wybierz lokalizację kopii zapasowej</string>
+    <string name="do_backup_now">Wykonaj kopię zapasową teraz</string>
+    <string name="automatic_daily_backup">Automatyczna codzienna kopia zapasowa</string>
+    <string name="restore_from_backup">Przywróć z kopii zapasowej</string>
+    <string name="are_you_really_sure_question">Jesteś pewien?</string>
+    <string name="backup_source_confirm">Potwierdzenie źródła kopii zapasowej</string>
+    <string name="no_backup_location_set">Nie ustawiono lokalizacji kopii zapasowej</string>
+    <string name="backing_up">Tworzenie kopii zapasowej</string>
+    <string name="did_backup_ok">Kopia zapasowa ok</string>
+    <string name="backup_failed">Kopia zapasowa nie powiodła się</string>
+    <string name="automatically_manage_backup">Zarządzaj automatycznie</string>
+    <string name="choose_backup_file">Wybierz plik kopii zapasowej</string>
+    <string name="change_account">Zmień konto</string>
+    <string name="keep_same_account">Zachowaj to samo konto</string>
+    <string name="change_google_account">Zmień konto Google</string>
+    <string name="attempting_restore">Próba przywrócenia</string>
+    <string name="restore_succeeded_restarting">Przywracanie zakończone powodzeniem - ponowne uruchomienie aplikacji</string>
+    <string name="restore_failed">Przywracanie nie powiodło się!</string>
+    <string name="error_exclamation">Błąd!</string>
+    <string name="checking_file">Sprawdzanie pliku</string>
+    <string name="failed_to_read_file">Nie udało się odczytać pliku</string>
+    <string name="permission_problem_retry">Problem z uprawnieniami - ponów próbę</string>
+    <string name="no_file_was_chosen">Nie wybrano pliku</string>
+    <string name="could_not_sign_in">Nie udało się zalogować</string>
+    <string name="problem_with_file_selection">Problem z wyborem pliku</string>
+    <string name="selected_file_location">Wybrana lokalizacja pliku</string>
+    <string name="please_reselect_backup_file">Proszę ponownie wybrać plik kopii zapasowej</string>
+    <string name="ready">Gotowy</string>
+    <string name="uploading_to_cloud">Przesyłanie do chmury</string>
+    <string name="error_with_local_backup">Błąd lokalnej kopii zapasowej</string>
+    <string name="upload_successful">Przesyłanie zakończone powodzeniem</string>
+    <string name="error_uploading_to_cloud">Błąd podczas przesyłania do chmury</string>
+    <string name="creating_local_backup">Tworzenie lokalnej kopii zapasowej</string>
+    <string name="please_grant_permission">Proszę przyznaj uprawnienia</string>
+    <string name="drive_permission_blurb">Aby automatycznie utworzyć kopię zapasową xDrip potrzebuje uprawnień do korzystania z twojego Dysku Google.\n\nDeweloperzy xDrip nie mogą uzyskać dostępu do żadnych plików ani zobaczyć Twoich danych osobowych.</string>
+    <string name="cloud_backup">Kopia zapasowa w chmurze</string>
+    <string name="restoring_backup_will_erase_warning">Przywracanie kopii zapasowej usunie Twoje bieżące ustawienia i dane z kopii zapasowej.\n\nCzy na pewno chcesz to zrobić?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">Ta kopia zapasowa wygląda jakby pochodziła z innego urządzenia:\n%s\nCzy na pewno chcesz przywrócić z tej kopii zapasowej?</string>
+    <string name="megabyte_format_string">%.1f MB</string>
 </resources>

From b90aa2ac7a097beb704f633bc3f68b3547f403a8 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sat, 10 Sep 2022 12:24:30 +0100
Subject: [PATCH 48/52] New translations strings.xml (Czech)

---
 app/src/main/res/values-cs/strings-cs.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/values-cs/strings-cs.xml b/app/src/main/res/values-cs/strings-cs.xml
index a11efe9d36..2973a57aea 100644
--- a/app/src/main/res/values-cs/strings-cs.xml
+++ b/app/src/main/res/values-cs/strings-cs.xml
@@ -88,8 +88,15 @@
     <string name="pref_amazfit_other_alert_enable_summary">Odesílat ostatní výstrahy do hodinek</string>
     <string name="pref_amazfit_other_alert_enable">Povolit</string>
     <string name="pref_amazfit_other_alert_title">Další výstrahy</string>
+    <string name="pref_amazfit_watchface_graph_dots_summary">Zobrazí drobné tečky místo malých</string>
     <string name="pref_amazfit_watchface_graph_enable">Povolit</string>
+    <string name="pref_amazfit_watchface_graph_hours_summary">nastavte počet hodin v grafu</string>
+    <string name="pref_amazfit_widget_graph_hours_title">Graf widgetu</string>
+    <string name="pref_amazfit_widget_graph_hours_summary">nastavte počet hodin v grafu</string>
+    <string name="pref_amazfit_widget_graph_dots_summary">Zobrazí drobné tečky místo malých</string>
     <string name="pref_amazfit_widget_graph_enable">Povolit</string>
+    <string name="pref_amazfit_widget_graph_title">Graf widgetu</string>
+    <string name="pref_amazfit_widget_graph_enable_summary">Zobrazí graf ve widgetu</string>
     <string name="toast_crash">Něco je špatně :( Hlášení o tom bylo odesláno</string>
     <string name="taskerConfigInstruction">Kliknout na Tick ikonu pro potvrzení. Není potřeba měnit konfigurační řetězec.</string>
     <string name="taskerConfiguration">Konfigurace Taskeru</string>
@@ -104,6 +111,7 @@
     <string name="export_submenu">Možnosti importu/exportu</string>
     <string name="action_resend_to_watch">Znovu odeslat glukémii do hodinek</string>
     <string name="action_open_watch_setting">Otevřít nastavení na Android Wear</string>
+    <string name="action_sync_watch_db">Resetovat Wear databázi</string>
     <string name="erase">Vymazat</string>
     <string name="interface_tips_from_start">Všechny tipy budou zobrazeny znovu od začátku</string>
     <string name="note_button">Tlačítko poznámky</string>
@@ -146,12 +154,15 @@
     <string name="checking_for_update">Kontrola aktualizací...</string>
     <string name="signal_missed">Signál nezachycený</string>
     <string name="minutes_ago">{0, choice,0#{0, number, integer} Minut zpět|1#{0, number, integer} Minuta zpět|1&lt;{0, number, integer} Minut zpět}</string>
+    <string name="expires_at">Končí v {0}</string>
     <string name="space_minutes_ago">" minut zpět"</string>
     <string name="space_minute_ago">" minuta zpět"</string>
     <string name="show_parakeet_map">Zobrazit mapu Parakeetů</string>
     <string name="switch_parakeet_to_setup_mode">Přepnout Parakeet do módu nastavování</string>
     <string name="view_events_log">Zobrazit logy</string>
+    <string name="show_libre_trend">Zobrazovat trend z Libre</string>
     <string name="libre_15_minutes_graph">15-ti minutový graf Libre</string>
+    <string name="libre_last_x_minutes_graph">Graf za posledních %d minut z Libre</string>
     <string name="share_config_via_qr_code">Sdílet konfiguraci QR kódem</string>
     <string name="check_for_updated_version">Kontrola nové verze</string>
     <string name="send_feedback_to_developer">Odeslat zpětnou vazbou vývojářům</string>
@@ -163,6 +174,7 @@
     <string name="general_settings">Obecná nastavení</string>
     <string name="high_value">Vysoká hodnota</string>
     <string name="low_value">Nízká hodnota</string>
+    <string name="stats_range_settings">Nastavení rozsahu: </string>
     <string name="end_user_license_agreement">Licenční ujednání</string>
     <string name="save">Uložit</string>
     <string name="view_important_warning">Zobrazit důležitá varování</string>
@@ -266,6 +278,7 @@
     <string name="upload_data_to_dex_servers">Nahrávat data na servery Dexcom, aby bylo možné je používat s jejich aplikacemi</string>
     <string name="manage_followers">Spravovat následovníky</string>
     <string name="manage_existing_followers">Spravovat existující následovníky a pozvání nových</string>
+    <string name="invite_follower">Pozvat sledujícího</string>
     <string name="glucose_calibration_and_other_alerts">Výstrahy glykémie, kalibrace a další</string>
     <string name="alert_volume_profile">Zvukový profil výstrahy</string>
     <string name="smart_alerting">Inteligentní výstrahy</string>

From cd6e6499f7733fb9cc9ea9f17ed59db7438d7b34 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sat, 10 Sep 2022 12:24:32 +0100
Subject: [PATCH 49/52] New translations strings.xml (Italian)

---
 app/src/main/res/values-it/strings-it.xml | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/app/src/main/res/values-it/strings-it.xml b/app/src/main/res/values-it/strings-it.xml
index 1dcbea460f..b51528224a 100644
--- a/app/src/main/res/values-it/strings-it.xml
+++ b/app/src/main/res/values-it/strings-it.xml
@@ -1669,4 +1669,54 @@
     <string name="cannot_choose_file_without_permission">Impossibile scegliere il file senza i permessi di accesso alla memoria</string>
     <string name="select_time">Seleziona Orario</string>
     <string name="select_tone_for_alerts">Seleziona Tono Allarme</string>
+    <string name="you_can_use_google_drive_for_backup">Puoi utilizzare Google Drive per il backup</string>
+    <string name="select_backup_location">Seleziona dove salvare il Backup</string>
+    <string name="do_backup_now">Esegui ora il backup</string>
+    <string name="automatic_daily_backup">Backup automatico giornaliero</string>
+    <string name="restore_from_backup">Ripristino da Backup</string>
+    <string name="are_you_really_sure_question">Sei davvero sicuro?</string>
+    <string name="backup_source_confirm">Conferma Sorgente Di Backup</string>
+    <string name="nothing_to_restore_please_select">Niente da ripristinare - selezionare la posizione</string>
+    <string name="no_backup_location_set">Nessuna percorso di backup impostato</string>
+    <string name="backing_up">Backup in corso</string>
+    <string name="did_backup_ok">Backup fatto ok</string>
+    <string name="backup_failed">Backup fallito</string>
+    <string name="automatically_manage_backup">Gestisci Automaticamente</string>
+    <string name="use_alternate_file">Usa File Alternativo</string>
+    <string name="choose_backup_file">Scegli il file di backup</string>
+    <string name="select_alternate_file">Seleziona file alternativo</string>
+    <string name="change_account">Cambia account</string>
+    <string name="keep_same_account">Mantieni lo stesso account</string>
+    <string name="change_google_account">Seleziona un Account Google</string>
+    <string name="attempting_restore">Tentativo Di Ripristino</string>
+    <string name="restore_succeeded_restarting">Ripristino riuscito - riavvio app</string>
+    <string name="restore_failed">Ripristino FALLITO!</string>
+    <string name="error_exclamation">Errore!</string>
+    <string name="checking_file">Controllo file</string>
+    <string name="failed_to_read_file">Impossibile leggere il file</string>
+    <string name="permission_problem_retry">Problema di autorizzazione - riprova</string>
+    <string name="alternate_file_selected">File alternativo selezionato</string>
+    <string name="temporary_google_drive_file">File temporaneo di Google Drive</string>
+    <string name="no_file_was_chosen">Nessun file selezionato</string>
+    <string name="could_not_sign_in">Impossibile autenticare l\'utente</string>
+    <string name="problem_with_file_selection">Problema con la selezione del file</string>
+    <string name="selected_file_location">Posizione del file selezionato</string>
+    <string name="please_reselect_backup_file">Selezionare nuovamente il file di backup</string>
+    <string name="ready">Pronto</string>
+    <string name="uploading_to_cloud">Caricamento nel cloud</string>
+    <string name="error_with_local_backup">Errore di backup locale</string>
+    <string name="upload_successful">Caricamento riuscito</string>
+    <string name="error_uploading_to_cloud">Errore nel caricamento sul cloud</string>
+    <string name="creating_local_backup">Creazione backup locale</string>
+    <string name="output_error">Errore di output:</string>
+    <string name="security_error">Errore di sicurezza:</string>
+    <string name="please_grant_permission">Consentire il permesso</string>
+    <string name="drive_permission_blurb">Per eseguire il backup automatico di xDrip è necessario il permesso di utilizzare il tuo Google Drive.\n\nGli sviluppatori xDrip non possono accedere a nessuno dei tuoi file o vedere le tue informazioni personali.</string>
+    <string name="cloud_backup">Backup nel Cloud</string>
+    <string name="select_automatic_or_select_alternate">Selezionare Automatico per permettere a xDrip di gestire i file nel Google Drive o selezionare un file alternativo per ripristinare da altrove.</string>
+    <string name="restoring_backup_will_erase_warning">Il ripristino di un backup cancellerà le impostazioni e i dati correnti con quello dal backup.\n\nSei assolutamente sicuro di voler fare questo?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">Questo backup sembra provenire da un altro dispositivo:\n%s\nSei sicuro di voler ripristinare da questo backup?</string>
+    <string name="megabyte_format_string">%.1f MB</string>
+    <string name="manual_selection_google_drive_file_warning">Hai selezionato un file da Google Drive, ma questo non è gestito automaticamente da xDrip. Può essere utilizzato solo per backup e ripristino manuali.\n\nNon verrà effettuato alcun backup automatico con questo file.\n\nContinuare?</string>
+    <string name="alternate_file_selected_warning">Hai selezionato un file alternativo. In genere serve solo per ripristinare un backup salvato localmente.\n\nNon verrà effettuato alcun backup automatico con questo file.\n\nContinuare?</string>
 </resources>

From c02157074ef7a4765a8c8dbacad8de4a59340548 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sat, 10 Sep 2022 12:24:33 +0100
Subject: [PATCH 50/52] New translations strings.xml (Croatian)

---
 app/src/main/res/values-hr/strings-hr.xml | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/app/src/main/res/values-hr/strings-hr.xml b/app/src/main/res/values-hr/strings-hr.xml
index 317fe4a9a6..3340b3c446 100644
--- a/app/src/main/res/values-hr/strings-hr.xml
+++ b/app/src/main/res/values-hr/strings-hr.xml
@@ -994,4 +994,55 @@
     <string name="last_reading">Zadnje očitanje</string>
     <string name="show_unsmoothed">Prikaži neuglađeno</string>
     <string name="show_unsmoothed_summary">Prikaži i neizglađene podatke ako je omogućeno izglađivanje grafikona. Ako se koristi dodatak za kalibraciju, prikazat će neizglađene podatke umjesto podataka dodatka.</string>
+    <string name="you_can_use_google_drive_for_backup">Za sigurnosno kopiranje možete koristiti Google disk</string>
+    <string name="select_backup_location">Odaberite lokaciju sigurnosne kopije</string>
+    <string name="do_backup_now">Napravite sigurnosnu kopiju sada</string>
+    <string name="automatic_daily_backup">Automatsko dnevno sigurnosno kopiranje</string>
+    <string name="restore_from_backup">Vrati podatke iz sigurnosne kopije</string>
+    <string name="are_you_really_sure_question">Jeste li stvarno sigurni?</string>
+    <string name="backup_source_confirm">Potvrda izvora sigurnosne kopije</string>
+    <string name="nothing_to_restore_please_select">Ništa za vraćanje - odaberite lokaciju</string>
+    <string name="no_backup_location_set">Nije određena lokacija za pričuvne kopije</string>
+    <string name="backing_up">Sigurnosno kopiranje</string>
+    <string name="did_backup_ok">Sigurnosna kopija je u redu</string>
+    <string name="backup_failed">Sigurnosno kopiranje nije uspjelo</string>
+    <string name="automatically_manage_backup">Automatski upravljaj</string>
+    <string name="use_alternate_file">Koristite alternativnu datoteku</string>
+    <string name="choose_backup_file">Odaberite datoteku sigurnosne kopije</string>
+    <string name="select_alternate_file">Odaberite alternativnu datoteku</string>
+    <string name="change_account">Promijeni račun</string>
+    <string name="keep_same_account">Zadrži postojeći račun</string>
+    <string name="change_google_account">Promjena Google računa</string>
+    <string name="attempting_restore">Pokušaj vraćanja</string>
+    <string name="restore_succeeded_restarting">Vraćanje je uspjelo - ponovno pokretanje aplikacije</string>
+    <string name="restore_failed">Vraćanje NIJE USPJELO!</string>
+    <string name="error_exclamation">Greška!</string>
+    <string name="checking_file">Provjera datoteke</string>
+    <string name="failed_to_read_file">Failed to read file</string>
+    <string name="permission_problem_retry">Problem s dopuštenjem - pokušaj ponovno</string>
+    <string name="alternate_file_selected">Odabrana je alternativna datoteka</string>
+    <string name="temporary_google_drive_file">Privremena datoteka Google diska</string>
+    <string name="no_file_was_chosen">Nijedna datoteka nije odabrana</string>
+    <string name="could_not_sign_in">Nije bilo moguće prijaviti se</string>
+    <string name="problem_with_file_selection">Problem s odabirom datoteke</string>
+    <string name="selected_file_location">Odabrano mjesto datoteke</string>
+    <string name="please_reselect_backup_file">Molimo ponovno odaberite datoteku sigurnosne kopije</string>
+    <string name="ready">Spreman</string>
+    <string name="uploading_to_cloud">Prijenos u oblak</string>
+    <string name="error_with_local_backup">Pogreška s lokalnom sigurnosnom kopijom</string>
+    <string name="upload_successful">Učitavanje uspješno</string>
+    <string name="error_uploading_to_cloud">Pogreška pri prijenosu u oblak</string>
+    <string name="creating_local_backup">Stvaranje lokalne sigurnosne kopije</string>
+    <string name="output_error">Greška izlaza:</string>
+    <string name="security_error">Sigurnosna pogreška:</string>
+    <string name="please_grant_permission">Molimo dajte dopuštenje</string>
+    <string name="drive_permission_blurb">Za automatsko sigurnosno kopiranje xDrip treba dopuštenje za korištenje vašeg Google diska.\n\nxDrip programeri ne mogu pristupiti vašim datotekama niti vidjeti vaše osobne podatke.</string>
+    <string name="cloud_backup">Sigurnosna kopija u oblaku</string>
+    <string name="select_automatic_or_select_alternate">Odaberite Automatski za xDrip za upravljanje datotekama na Google disku ili odaberite alternativnu određenu datoteku za korištenje ako je trebate vratiti s drugog mjesta.</string>
+    <string name="restoring_backup_will_erase_warning">Vraćanje sigurnosne kopije izbrisat će vaše trenutne postavke i podatke s njima iz sigurnosne kopije.\n\nJeste li potpuno sigurni da to želite učiniti?</string>
+    <string name="this_backup_looks_like_came_from_different_format_string">Ova sigurnosna kopija izgleda kao da je došla s drugog uređaja:\n%s\nJeste li sigurni da želite vratiti iz ove sigurnosne kopije?</string>
+    <string name="megabyte_format_string">%.1f MB</string>
+    <string name="manual_selection_google_drive_file_warning">Odabrali ste datoteku s Google diska, ali njome ne upravlja automatski xDrip pa se može koristiti samo za ručno sigurnosno kopiranje i vraćanje.\n\nNeće se dogoditi automatsko sigurnosno kopiranje ove datoteke.\n\nNastaviti?
+CONTEXTREQUEST?</string>
+    <string name="alternate_file_selected_warning">Odabrali ste alternativnu datoteku. Obično bi to bilo samo vraćanje iz lokalno pohranjene sigurnosne kopije.\n\nNeće se dogoditi automatsko sigurnosno kopiranje ove datoteke.\n\nNastaviti?</string>
 </resources>

From 43b0ef709aa76970feba0359e6679e2e386be129 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sun, 11 Sep 2022 12:26:26 +0100
Subject: [PATCH 51/52] New translations strings.xml (Greek)

---
 app/src/main/res/values-el/strings-el.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-el/strings-el.xml b/app/src/main/res/values-el/strings-el.xml
index 16018721f9..3e0d5dca7c 100644
--- a/app/src/main/res/values-el/strings-el.xml
+++ b/app/src/main/res/values-el/strings-el.xml
@@ -50,6 +50,7 @@
     <string name="pref_dialog_mongodb_collection">Εισάγετε όνομα συλλογής</string>
     <string name="pref_message_mongodb_collection">Αυτό είναι το όνομα της συλλογής όπου θα αποθηκεύονται τα δεδομένα CGM</string>
     <string name="pref_title_mongodb_device_status_collection">Όνομα συλλογής κατάστασης συσκευής</string>
+    <string name="pref_dialog_mongodb_device_status_collection">Όνομα συλλογής κατάστασης συσκευής\"</string>
     <string name="pref_message_mongodb_device_status_collection">Όνομα συλλογής όπου θα αποθηκεύονται τα δεδομένα μπαταρίας και άλλων συσκευών</string>
     <!-- API Settings -->
     <string name="pref_title_api">Συγχρονισμός Nightscout (REST-API)</string>

From caffc7cbf425d7a2c657c01d63b5899e55c9ac58 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Wed, 14 Sep 2022 07:39:01 +0000
Subject: [PATCH 52/52] Updated contributing document

---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 048d7a8855..5e9024e18f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,6 +17,12 @@ Patches are welcomed! To ensure the best all round results they need be a good f
 
 The best way to get patches accepted is to discuss your ideas with project maintainers using [Discussions](https://github.com/NightscoutFoundation/xDrip/discussions) prior to implementation and discuss how to structure things so that they can fit well within the project and also the rationale for the change.
 
+#### Copyright of submitted contributions
+
+Any submitted patches and pull requests must either be the original work of the submitter or be available under a suitable open source license which is compatible with inclusion in a GPL licensed project.
+
+This also applies to graphics, sounds or other binary file content. Ideally these should be either the original work of the submitter or be in the public domain. They should not contain trademarks.
+
 #### Project reviewers are likely to use criteria similar to that outlined below:
 
 * Does the patch affect any existing functionality? What is the impact of the change?