Add "Ignore battery optimizations" to welcome wizard (#21)

* Move "Ignore battery optimizations" dialog from MainActivity
to FirstStartActivity

* Add welcome slide "ignore doze"

* Make "ignore doze" mandatory

app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java

@@ -1,16 +1,21 @@
 package com.nutomic.syncthingandroid.activities;
 
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.Manifest;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -64,6 +69,7 @@ public class FirstStartActivity extends Activity {
      * shown.
      */
     private int mSlidePosStoragePermission = -1;
+    private int mSlidePosIgnoreDozePermission = -1;
     private int mSlidePosKeyGeneration = -1;
 
     private ViewPager mViewPager;
@@ -89,6 +95,7 @@ public class FirstStartActivity extends Activity {
          * If anything mandatory is missing, the according welcome slide(s) will be shown.
          */
         Boolean showSlideStoragePermission = !haveStoragePermission();
+        Boolean showSlideIgnoreDozePermission = !haveIgnoreDozePermission();
         Boolean showSlideLocationPermission = !haveLocationPermission();
         Boolean showSlideKeyGeneration = !Constants.getConfigFile(this).exists();
 
@@ -96,7 +103,9 @@ public class FirstStartActivity extends Activity {
          * If we don't have to show slides for mandatory prerequisites,
          * start directly into MainActivity.
          */
-        if (!showSlideStoragePermission && !showSlideKeyGeneration) {
+        if (!showSlideStoragePermission &&
+                !showSlideIgnoreDozePermission &&
+                !showSlideKeyGeneration) {
             startApp();
             return;
         }
@@ -130,10 +139,15 @@ public class FirstStartActivity extends Activity {
         mSlides = new Slide[
                 1 +
                 (showSlideStoragePermission ? 1 : 0) +
+                (showSlideIgnoreDozePermission ? 1 : 0) +
                 (showSlideLocationPermission ? 1 : 0) +
                 (showSlideKeyGeneration ? 1 : 0)
         ];
         mSlides[slideIndex++] = new Slide(R.layout.activity_firststart_intro, colorsActive[0], colorsInactive[0]);
+        if (showSlideIgnoreDozePermission) {
+            mSlidePosIgnoreDozePermission = slideIndex;
+            mSlides[slideIndex++] = new Slide(R.layout.activity_firststart_ignore_doze_permission, colorsActive[4], colorsInactive[4]);
+        }
         if (showSlideStoragePermission) {
             mSlidePosStoragePermission = slideIndex;
             mSlides[slideIndex++] = new Slide(R.layout.activity_firststart_storage_permission, colorsActive[1], colorsInactive[1]);
@@ -193,6 +207,15 @@ public class FirstStartActivity extends Activity {
             }
         }
 
+        if (mViewPager.getCurrentItem() == mSlidePosIgnoreDozePermission) {
+            // As the ignore doze permission is a prerequisite to run syncthing, refuse to continue without it.
+            if (!haveIgnoreDozePermission()) {
+                Toast.makeText(this, R.string.toast_ignore_doze_permission_required,
+                        Toast.LENGTH_LONG).show();
+                return;
+            }
+        }
+
         int current = getItem(+1);
         if (current < mSlides.length) {
             // Move to next slide.
@@ -204,7 +227,6 @@ public class FirstStartActivity extends Activity {
         } else {
             // Start the app after "mNextButton" was hit on the last slide.
             Log.v(TAG, "User completed first start UI.");
-            mPreferences.edit().putBoolean(Constants.PREF_FIRST_START, false).apply();
             startApp();
         }
     }
@@ -288,6 +310,17 @@ public class FirstStartActivity extends Activity {
                 });
             }
 
+            /* Slide: ignore doze permission */
+            Button btnGrantIgnoreDozePerm = (Button) view.findViewById(R.id.btnGrantIgnoreDozePerm);
+            if (btnGrantIgnoreDozePerm != null) {
+                btnGrantIgnoreDozePerm.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        requestIgnoreDozePermission();
+                    }
+                });
+            }
+
             /* Slide: location permission */
             Button btnGrantLocationPerm = (Button) view.findViewById(R.id.btnGrantLocationPerm);
             if (btnGrantLocationPerm != null) {
@@ -342,6 +375,30 @@ public class FirstStartActivity extends Activity {
     /**
      * Permission check and request functions
      */
+    private boolean haveIgnoreDozePermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            // Older android version don't have the doze feature so we'll assume having the anti-doze permission.
+            return true;
+        }
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        return pm.isIgnoringBatteryOptimizations(getPackageName());
+    }
+
+    @SuppressLint("InlinedApi")
+    @TargetApi(23)
+    private void requestIgnoreDozePermission() {
+        Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+        intent.setData(Uri.parse("package:" + getPackageName()));
+        try {
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            // Some devices dont seem to support this request (according to Google Play
+            // crash reports).
+            Log.w(TAG, "Request ignore battery optimizations not supported", e);
+            Toast.makeText(this, R.string.dialog_disable_battery_optimizations_not_supported, Toast.LENGTH_LONG).show();
+        }
+    }
+
     private boolean haveLocationPermission() {
         int permissionState = ContextCompat.checkSelfPermission(this,
                 Manifest.permission.ACCESS_COARSE_LOCATION);

app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -19,8 +18,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.os.PowerManager;
-import android.provider.Settings;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -73,7 +70,6 @@ public class MainActivity extends StateDialogActivity
 
     private static final String TAG = "MainActivity";
     private static final String IS_SHOWING_RESTART_DIALOG = "RESTART_DIALOG_STATE";
-    private static final String BATTERY_DIALOG_DISMISSED = "BATTERY_DIALOG_STATE";
     private static final String IS_QRCODE_DIALOG_DISPLAYED = "QRCODE_DIALOG_STATE";
     private static final String QRCODE_BITMAP_KEY = "QRCODE_BITMAP";
     private static final String DEVICEID_KEY = "DEVICEID";
@@ -89,7 +85,6 @@ public class MainActivity extends StateDialogActivity
     private AlertDialog mQrCodeDialog;
     private Dialog mRestartDialog;
 
-    private boolean mBatteryOptimizationDialogDismissed;
     private SyncthingService.State mSyncthingServiceState = SyncthingService.State.INIT;
 
     private ViewPager mViewPager;
@@ -117,7 +112,6 @@ public class MainActivity extends StateDialogActivity
             case STARTING:
                 break;
             case ACTIVE:
-                showBatteryOptimizationDialogIfNecessary();
                 mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
 
                 // Check if the usage reporting minimum delay passed by.
@@ -135,40 +129,6 @@ public class MainActivity extends StateDialogActivity
         }
     }
 
-    private void showBatteryOptimizationDialogIfNecessary() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-            return;
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        boolean dontShowAgain = mPreferences.getBoolean("battery_optimization_dont_show_again", false);
-        if (dontShowAgain || mBatteryOptimizationsDialog != null ||
-                pm.isIgnoringBatteryOptimizations(getPackageName()) ||
-                mBatteryOptimizationDialogDismissed) {
-            return;
-        }
-
-        mBatteryOptimizationsDialog = new AlertDialog.Builder(this)
-                .setTitle(R.string.dialog_disable_battery_optimization_title)
-                .setMessage(R.string.dialog_disable_battery_optimization_message)
-                .setPositiveButton(R.string.dialog_disable_battery_optimization_turn_off, (d, i) -> {
-                    Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                    intent.setData(Uri.parse("package:" + getPackageName()));
-                    try {
-                        startActivity(intent);
-                    } catch (ActivityNotFoundException e) {
-                        // Some devices dont seem to support this request (according to Google Play
-                        // crash reports).
-                        Log.w(TAG, "Request ignore battery optimizations not supported", e);
-                        Toast.makeText(this, R.string.dialog_disable_battery_optimizations_not_supported, Toast.LENGTH_LONG).show();
-                        mPreferences.edit().putBoolean("battery_optimization_dont_show_again", true).apply();
-                    }
-                })
-                .setNeutralButton(R.string.dialog_disable_battery_optimization_later, (d, i) -> mBatteryOptimizationDialogDismissed = true)
-                .setNegativeButton(R.string.dialog_disable_battery_optimization_dont_show_again, (d, i) ->
-                        mPreferences.edit().putBoolean("battery_optimization_dont_show_again", true).apply())
-                .setOnCancelListener(d -> mBatteryOptimizationDialogDismissed = true)
-                .show();
-    }
-
     /**
      * Returns the unix timestamp at which the app was first installed.
      */
@@ -223,7 +183,6 @@ public class MainActivity extends StateDialogActivity
             if (savedInstanceState.getBoolean(IS_SHOWING_RESTART_DIALOG)){
                 showRestartDialog();
             }
-            mBatteryOptimizationDialogDismissed = savedInstanceState.getBoolean(BATTERY_DIALOG_DISMISSED);
             if(savedInstanceState.getBoolean(IS_QRCODE_DIALOG_DISPLAYED)) {
                 showQrCodeDialog(savedInstanceState.getString(DEVICEID_KEY), savedInstanceState.getParcelable(QRCODE_BITMAP_KEY));
             }
@@ -373,7 +332,6 @@ public class MainActivity extends StateDialogActivity
         putFragment.accept(mDrawerFragment);
 
         outState.putInt("currentTab", mViewPager.getCurrentItem());
-        outState.putBoolean(BATTERY_DIALOG_DISMISSED, mBatteryOptimizationsDialog == null || !mBatteryOptimizationsDialog.isShowing());
         outState.putBoolean(IS_SHOWING_RESTART_DIALOG, mRestartDialog != null && mRestartDialog.isShowing());
         if(mQrCodeDialog != null && mQrCodeDialog.isShowing()) {
             outState.putBoolean(IS_QRCODE_DIALOG_DISPLAYED, true);

app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java

@@ -23,7 +23,6 @@ public class Constants {
     public static final String PREF_RUN_IN_FLIGHT_MODE          = "run_in_flight_mode";
 
     // Preferences - Behaviour
-    public static final String PREF_FIRST_START                 = "first_start";
     public static final String PREF_START_INTO_WEB_GUI          = "start_into_web_gui";
     public static final String PREF_USE_ROOT                    = "use_root";
     public static final String PREF_NOTIFICATION_TYPE           = "notification_type";

app/src/main/res/layout/activity_firststart_ignore_doze_permission.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_screen5">
+
+    <LinearLayout
+        android:background="@color/bg_screen5"
+        android:gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/welcome_title"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="30sp"
+            android:layout_margin="30dp" />
+
+        <ImageView
+            android:layout_width="@dimen/img_width_height"
+            android:layout_height="@dimen/img_width_height"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_battery_lightning" />
+
+        <Button
+            android:id="@+id/btnGrantIgnoreDozePerm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="40dp"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:paddingStart="40dp"
+            android:text="@string/grant_permission"
+            android:contentDescription="@string/grant_permission"
+            android:drawableLeft="@android:drawable/ic_menu_manage"
+            android:drawableStart="@android:drawable/ic_menu_manage"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ignore_doze_permission_title"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_title"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:text="@string/ignore_doze_permission_desc"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_desc" />
+
+    </LinearLayout>
+
+
+</RelativeLayout>

app/src/main/res/values-ar/strings.xml

@@ -20,8 +20,6 @@
   <string name="yes">نعم</string>
   <string name="no">لا</string>
   <string name="open_website">فتح موقع الويب</string>
-  <string name="dialog_disable_battery_optimization_later">فيما بعد</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">لا تظهر ثانيةً</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">تحميل ...</string>

app/src/main/res/values-bg/strings.xml

@@ -29,10 +29,7 @@
   <string name="no">Не</string>
   <string name="open_website">Отвори уеб сайта</string>
   <string name="toast_write_storage_permission_required">Приложението изисква права за записване в хранилището на данни</string>
-  <string name="dialog_disable_battery_optimization_title">Пестене на батерия</string>
+  <string name="ignore_doze_permission_title">Пестене на батерия</string>
-  <string name="dialog_disable_battery_optimization_later">По-късно</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Без повторно запитване</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Изключване за синхронизирането</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Зареждане...</string>

app/src/main/res/values-ca-rES/strings.xml

@@ -30,11 +30,8 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="no">No</string>
   <string name="open_website">Obre la pàgina web</string>
   <string name="toast_write_storage_permission_required">Aquesta aplicació requereix el permís d\'escriptura a l\'emmagatzematge</string>
-  <string name="dialog_disable_battery_optimization_title">Optimització de bateria</string>
+  <string name="ignore_doze_permission_title">Optimització de bateria</string>
-  <string name="dialog_disable_battery_optimization_message">Passat algun temps, l\'Android podria aturar la sincronització. Per evitar-ho, apagueu l\'optimitzador de bateria.\n\nAlguns dispositius porten pre-instal·lades aplicacions que finalitzen les tasques automàticament, en aquest cas hauríeu d\'afegir el Syncthing a la seva llista d\'aplicacions autoritzades.</string>
+  <string name="ignore_doze_permission_desc">Passat algun temps, l\'Android podria aturar la sincronització. Per evitar-ho, apagueu l\'optimitzador de bateria.\n\nAlguns dispositius porten pre-instal·lades aplicacions que finalitzen les tasques automàticament, en aquest cas hauríeu d\'afegir el Syncthing a la seva llista d\'aplicacions autoritzades.</string>
-  <string name="dialog_disable_battery_optimization_later">Més tard</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">No ho tornis a mostrar</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Desactiva per al Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">El teu dispositiu no permet desactivar les optimitzacions de bateria</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-cs/strings.xml

@@ -30,11 +30,8 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="no">Ne</string>
   <string name="open_website">Otevřít webovou stránku</string>
   <string name="toast_write_storage_permission_required">Tato aplikace vyžaduje oprávnění pro zápis do úložiště</string>
-  <string name="dialog_disable_battery_optimization_title">Optimalizace využití baterie</string>
+  <string name="ignore_doze_permission_title">Optimalizace využití baterie</string>
-  <string name="dialog_disable_battery_optimization_message">Po nějakém čase může Android zastavit synchronizaci. Aby se tak nestalo, vypněte optimalizaci využití baterie.\n\nNa některých zařízeních mohou být také předinstalovány aplikace ukončující úlohy. Měli byste přidat Syncthing do jejich výjimek.</string>
+  <string name="ignore_doze_permission_desc">Po nějakém čase může Android zastavit synchronizaci. Aby se tak nestalo, vypněte optimalizaci využití baterie.\n\nNa některých zařízeních mohou být také předinstalovány aplikace ukončující úlohy. Měli byste přidat Syncthing do jejich výjimek.</string>
-  <string name="dialog_disable_battery_optimization_later">Později</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Znovu neukazovat</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Vypnout pro Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Vaše zařízení nepodporuje vypnutí optimalizací baterie</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-da/strings.xml

@@ -29,11 +29,8 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <string name="no">Nej</string>
   <string name="open_website">Åben Hjemmeside</string>
   <string name="toast_write_storage_permission_required">Write storage rettigheder er nødvendige for denne app.</string>
-  <string name="dialog_disable_battery_optimization_title">Batterioptimering</string>
+  <string name="ignore_doze_permission_title">Batterioptimering</string>
-  <string name="dialog_disable_battery_optimization_message">Android stopper måske synkroniseringen efter noget tid. For at undgå dette, vælg batterioptimering fra.\n\nNogle enheder har ekstra job-afsluttende apps installeret. Du burde også tilføje Syncthing til deres whitelist. </string>
+  <string name="ignore_doze_permission_desc">Android stopper måske synkroniseringen efter noget tid. For at undgå dette, vælg batterioptimering fra.\n\nNogle enheder har ekstra job-afsluttende apps installeret. Du burde også tilføje Syncthing til deres whitelist. </string>
-  <string name="dialog_disable_battery_optimization_later">Senere</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Vis ikke igen</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Sluk for Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Din enhed understøtter ikke at slå batterioptimeringer fra.</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

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

@@ -31,14 +31,12 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <string name="yes">Ja</string>
   <string name="no">Nein</string>
   <string name="open_website">Webseite öffnen</string>
-  <string name="toast_write_storage_permission_required">Diese App benötigt Schreibzugriff auf den Gerätespeicher</string>
+  <string name="toast_write_storage_permission_required">Diese App benötigt Schreibzugriff auf den Gerätespeicher.</string>
   <string name="device_rejected">Gerät \"%1$s\" möchte sich verbinden</string>
   <string name="folder_rejected">Gerät \"%1$s\" möchte Verzeichnis \"%2$s\" teilen</string>
-  <string name="dialog_disable_battery_optimization_title">Batterielaufzeit Optimierung</string>
+  <string name="ignore_doze_permission_title">Batterielaufzeit Optimierung</string>
-  <string name="dialog_disable_battery_optimization_message">Android kann die Synchronisation nach einiger Zeit stoppen. Um dies zu verhindern kann der Energiesparmodus deaktiviert werden.\n\nEinige Geräte haben Apps vorinstalliert, welche Hintergrundaktivitäten unterbinden. Syncthing sollte deshalb auch in die Ausnahmeliste hinzugefügt werden.</string>
+  <string name="ignore_doze_permission_desc">Android kann die Synchronisation nach einiger Zeit stoppen. Um dies zu verhindern, muss der Energiesparmodus \"Doze\" deaktiviert werden.\n\nEinige Geräte haben Apps vorinstalliert, welche Hintergrundaktivitäten unterbinden. Syncthing sollte deshalb auch dort in die Ausnahmeliste hinzugefügt werden.</string>
-  <string name="dialog_disable_battery_optimization_later">Später</string>
+  <string name="toast_ignore_doze_permission_required">Diese App funktioniert nur dann zuverlässig, wenn Sie vom \"Doze\" Energiesparmodus ausgenommen wird.</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Nicht mehr zeigen.</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Für Syncthing abstellen.</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Dein Gerät unterstützt das deaktivieren der Batterielaufzeit Optimierung nicht</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-el/strings.xml

@@ -29,11 +29,8 @@
   <string name="no">Όχι</string>
   <string name="open_website">Άνοιγμα ιστοσελίδας</string>
   <string name="toast_write_storage_permission_required">Απαιτείται η άδεια αποθήκευσης δεδομένων για αυτή την εφαρμογή</string>
-  <string name="dialog_disable_battery_optimization_title">Βελτιστοποίηση μπαταρίας</string>
+  <string name="ignore_doze_permission_title">Βελτιστοποίηση μπαταρίας</string>
-  <string name="dialog_disable_battery_optimization_message">Το Android ενδέχεται να σταματήσει τον συγχρονισμό μετά από κάποιο χρονικό διάστημα. Για να αποφευχθεί αυτό, απενεργοποιήστε τη βελτιστοποίηση μπαταρίας.\n\nΚάποιες συσκευές διαθέτουν επίσης προεγκατεστημένες εφαρμογές τερματισμού διεργασιών. Προσθέστε το Syncthing στο whitelist τους.</string>
+  <string name="ignore_doze_permission_desc">Το Android ενδέχεται να σταματήσει τον συγχρονισμό μετά από κάποιο χρονικό διάστημα. Για να αποφευχθεί αυτό, απενεργοποιήστε τη βελτιστοποίηση μπαταρίας.\n\nΚάποιες συσκευές διαθέτουν επίσης προεγκατεστημένες εφαρμογές τερματισμού διεργασιών. Προσθέστε το Syncthing στο whitelist τους.</string>
-  <string name="dialog_disable_battery_optimization_later">Αργότερα</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Να μην εμφανιστεί ξανά</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Να απενεργοποιηθεί για το Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Η συσκευή σας δεν επιτρέπει την απενεργοποίηση των βελτιστοποιήσεων μπαταρίας</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-es-rMX/strings.xml

@@ -25,7 +25,6 @@
   <string name="no">No</string>
   <string name="open_website">Abrir Sitio web</string>
   <string name="toast_write_storage_permission_required">Esta aplicación requiere permiso para escribir en el almacenamiento</string>
-  <string name="dialog_disable_battery_optimization_later">Después</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Cargando...</string>

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

@@ -27,11 +27,8 @@
   <string name="no">No</string>
   <string name="open_website">Sitio abierto</string>
   <string name="toast_write_storage_permission_required">Esta app necesita permiso para escribir al sistema de almacenamiento</string>
-  <string name="dialog_disable_battery_optimization_title">Optimización de batería</string>
+  <string name="ignore_doze_permission_title">Optimización de batería</string>
-  <string name="dialog_disable_battery_optimization_message">Andoid puede detener la sincronización pasado un tiempo. Para evitarlo, deshabilita la optimización de batería.\n\nAlgunos dispositivos tienen instaladas aplicaciones adicionales para terminar tareas. Igualmente, deberías añadir Syncthing a su lista blanca.</string>
+  <string name="ignore_doze_permission_desc">Andoid puede detener la sincronización pasado un tiempo. Para evitarlo, deshabilita la optimización de batería.\n\nAlgunos dispositivos tienen instaladas aplicaciones adicionales para terminar tareas. Igualmente, deberías añadir Syncthing a su lista blanca.</string>
-  <string name="dialog_disable_battery_optimization_later">Después</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">No volver a mostrar.</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Deshabilitar para Syncthing</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Cargando...</string>

app/src/main/res/values-fi/strings.xml

@@ -30,11 +30,8 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="no">Ei</string>
   <string name="open_website">Avaa verkkosivu</string>
   <string name="toast_write_storage_permission_required">Tämä sovellus vaatii tallennustilan kirjoitusoikeuden</string>
-  <string name="dialog_disable_battery_optimization_title">Akun käytön optimointi</string>
+  <string name="ignore_doze_permission_title">Akun käytön optimointi</string>
-  <string name="dialog_disable_battery_optimization_message">Android saattaa pysäyttää synkronoinnin jonkin ajan kuluttua. Tämän estämiseksi, poista käytöstä akun käytön optimointi.\n\nJoissain laitteissa on lisäksi prosessienhallintasovelluksia valmiiksi asennettuna. Sinun tulisi lisätä Syncthing myös niiden sallittujen sovellusten listalle.</string>
+  <string name="ignore_doze_permission_desc">Android saattaa pysäyttää synkronoinnin jonkin ajan kuluttua. Tämän estämiseksi, poista käytöstä akun käytön optimointi.\n\nJoissain laitteissa on lisäksi prosessienhallintasovelluksia valmiiksi asennettuna. Sinun tulisi lisätä Syncthing myös niiden sallittujen sovellusten listalle.</string>
-  <string name="dialog_disable_battery_optimization_later">Myöhemmin</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Älä näytä uudelleen</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Poista käytöstä Synthingille</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Laitteesi ei tue akun käytön optimoinnin poistamista käytöstä</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

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

@@ -31,11 +31,8 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <string name="no">Non</string>
   <string name="open_website">Ouvrir le site WEB</string>
   <string name="toast_write_storage_permission_required">La permission d\'écriture sur l\'espace de stockage est requise pour cette application.</string>
-  <string name="dialog_disable_battery_optimization_title">Optimisation de la batterie</string>
+  <string name="ignore_doze_permission_title">Optimisation de la batterie</string>
-  <string name="dialog_disable_battery_optimization_message">Android peut arrêter la synchronisation après un certain temps.  Pour éviter cela, désactivez l\'optimisation de la batterie.\n\nCertains appareils disposent d\'applications préinstallées pour tuer les tâches.  Vous devrez ajouter Syncthing à leur liste blanche.</string>
+  <string name="ignore_doze_permission_desc">Android peut arrêter la synchronisation après un certain temps.  Pour éviter cela, désactivez l\'optimisation de la batterie.\n\nCertains appareils disposent d\'applications préinstallées pour tuer les tâches.  Vous devrez ajouter Syncthing à leur liste blanche.</string>
-  <string name="dialog_disable_battery_optimization_later">Plus tard</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Ne pas afficher la prochaine fois</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Mettre à l\'arrêt pour Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Votre appareil ne prend pas en charge la désactivation des optimisations de la batterie.</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-hu/strings.xml

@@ -34,13 +34,10 @@ Az összesített statisztika nyilvánosan elérhető a https://data.syncthing.ne
   <string name="no">Nem</string>
   <string name="open_website">Weblap megnyitása</string>
   <string name="toast_write_storage_permission_required">Az alkalmazás használatához háttértár-hozzáférési jogra van szükség</string>
-  <string name="dialog_disable_battery_optimization_title">Akkumulátor optimalizáció</string>
+  <string name="ignore_doze_permission_title">Akkumulátor optimalizáció</string>
-  <string name="dialog_disable_battery_optimization_message">Az Android idővel leállíthatja a szinkronizálást. Ennek megakadályozásához kapcsold ki az akkumulátor optimalizálást.
+  <string name="ignore_doze_permission_desc">Az Android idővel leállíthatja a szinkronizálást. Ennek megakadályozásához kapcsold ki az akkumulátor optimalizálást.
 
 Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a gyártó. Ezekben szintén érdemes a Syncthinget fehérlistára tenni.</string>
-  <string name="dialog_disable_battery_optimization_later">Később</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Ne jelenjen meg újra</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Syncthing kivételezése</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Az eszközöd nem támogatja az akkumulátor optimalizálás letiltását</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-in/strings.xml

@@ -27,11 +27,8 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <string name="no">Tidak</string>
   <string name="open_website">Buka Situs</string>
   <string name="toast_write_storage_permission_required">Aplikasi ini membutuuhkan kewenangan penulisan storage.</string>
-  <string name="dialog_disable_battery_optimization_title">Optimisasi Baterai</string>
+  <string name="ignore_doze_permission_title">Optimisasi Baterai</string>
-  <string name="dialog_disable_battery_optimization_message">Android mungkin akan menghentikan penyelarasan setelah beberapa waktu. Untuk mencegah hal ini, matikan optimisasi baterai.\n\nBeberapa perangkat mungkin sudah memiliki aplikasi penghentian tugas. Anda juga perlu memasukkan Syncthing pada whitelist aplikasi tersebut.</string>
+  <string name="ignore_doze_permission_desc">Android mungkin akan menghentikan penyelarasan setelah beberapa waktu. Untuk mencegah hal ini, matikan optimisasi baterai.\n\nBeberapa perangkat mungkin sudah memiliki aplikasi penghentian tugas. Anda juga perlu memasukkan Syncthing pada whitelist aplikasi tersebut.</string>
-  <string name="dialog_disable_battery_optimization_later">Nanti</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Jangan tampilkan lagi</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Matikan untuk Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Perangkat anda tidak mendukung untuk mematikan optimisasi baterai</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

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

@@ -31,11 +31,8 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <string name="no">No</string>
   <string name="open_website">Apri sito</string>
   <string name="toast_write_storage_permission_required">E\' richiesto il permesso di scrittura per questa app</string>
-  <string name="dialog_disable_battery_optimization_title">Ottimizzazione della batteria</string>
+  <string name="ignore_doze_permission_title">Ottimizzazione della batteria</string>
-  <string name="dialog_disable_battery_optimization_message">Android potrebbe interrompere la sincronizzazione dopo qualche tempo. Per evitare questo, spegnere l\'ottimizzazione della batteria.\n\nAlcuni dispositivi hanno ulteriori applicazioni preinstallate di inturruzione dei processi. Si dovrebbe aggiungere Syncthing alla loro whitelist.</string>
+  <string name="ignore_doze_permission_desc">Android potrebbe interrompere la sincronizzazione dopo qualche tempo. Per evitare questo, spegnere l\'ottimizzazione della batteria.\n\nAlcuni dispositivi hanno ulteriori applicazioni preinstallate di inturruzione dei processi. Si dovrebbe aggiungere Syncthing alla loro whitelist.</string>
-  <string name="dialog_disable_battery_optimization_later">Più tardi</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Non mostrare più</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Spegnere per Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Il tuo dispositivo non supporta la disabilitazione delle ottimizzazioni della batteria</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-ja/strings.xml

@@ -30,11 +30,8 @@
   <string name="no">いいえ</string>
   <string name="open_website">Web サイトを開く</string>
   <string name="toast_write_storage_permission_required">このアプリはストレージの書き込みアクセス許可が必要です</string>
-  <string name="dialog_disable_battery_optimization_title">バッテリー最適化</string>
+  <string name="ignore_doze_permission_title">バッテリー最適化</string>
-  <string name="dialog_disable_battery_optimization_message">Android はしばらくすると同期を停止することがあります。 これを防ぐには、バッテリーの最適化をオフにしてください。\n\n一部のデバイスには、タスク終了アプリが別途プリインストールされています。 これらのホワイトリストにも Syncthing を追加する必要があります。</string>
+  <string name="ignore_doze_permission_desc">Android はしばらくすると同期を停止することがあります。 これを防ぐには、バッテリーの最適化をオフにしてください。\n\n一部のデバイスには、タスク終了アプリが別途プリインストールされています。 これらのホワイトリストにも Syncthing を追加する必要があります。</string>
-  <string name="dialog_disable_battery_optimization_later">後で</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">再度表示しない</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Syncthing のためにオフにします</string>
   <string name="dialog_disable_battery_optimizations_not_supported">お使いのデバイスはバッテリーの最適化を無効にできません</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-ko/strings.xml

@@ -29,11 +29,8 @@
   <string name="no">아니오</string>
   <string name="open_website">웹사이트 열기</string>
   <string name="toast_write_storage_permission_required">스토리지 쓰기 권한이 필요합니다</string>
-  <string name="dialog_disable_battery_optimization_title">배터리 최적화</string>
+  <string name="ignore_doze_permission_title">배터리 최적화</string>
-  <string name="dialog_disable_battery_optimization_message">안드로이드 운영체제는 시간이 지나면 동기화를 정지시킬 수도 있습니다. 이를 막기 위해 배터리 최적화 기능을 꺼주시기 바랍니다.\n\n몇몇 기기들은 추가적인 태스크 관리 앱이 선탑재되어 있습니다. 태스크 관리 앱의 신뢰목록에 등록함으로써 역시 문제를 해결하실 수 있습니다.</string>
+  <string name="ignore_doze_permission_desc">안드로이드 운영체제는 시간이 지나면 동기화를 정지시킬 수도 있습니다. 이를 막기 위해 배터리 최적화 기능을 꺼주시기 바랍니다.\n\n몇몇 기기들은 추가적인 태스크 관리 앱이 선탑재되어 있습니다. 태스크 관리 앱의 신뢰목록에 등록함으로써 역시 문제를 해결하실 수 있습니다.</string>
-  <string name="dialog_disable_battery_optimization_later">나중에</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">다시 보지 않기</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Syncthing을 위해서 끄기</string>
   <string name="dialog_disable_battery_optimizations_not_supported">기기가 배터리 최적화 비활성화를 지원하지 않습니다.</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-nb/strings.xml

@@ -24,7 +24,6 @@
   <string name="no">Nei</string>
   <string name="open_website">Åpne nettsted</string>
   <string name="toast_write_storage_permission_required">Skriverettigheter til lagringsenheten kreves av denne appen</string>
-  <string name="dialog_disable_battery_optimization_later">Senere</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Laster...</string>

app/src/main/res/values-nl/strings.xml

@@ -31,11 +31,8 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <string name="no">Nee</string>
   <string name="open_website">Website openen</string>
   <string name="toast_write_storage_permission_required">Schrijftoegang is vereist voor deze applicatie</string>
-  <string name="dialog_disable_battery_optimization_title">Batterijoptimalisatie</string>
+  <string name="ignore_doze_permission_title">Batterijoptimalisatie</string>
-  <string name="dialog_disable_battery_optimization_message">Android kan je synchronisatie na een tijdje stoppen. Om dit te voorkomen kan je batterijoptimalisatie uitschakelen\n\nOp sommige apparaten staan extra apps voor beëindigen van taken, voeg Syncthing ook aan hun witte lijsten toe.</string>
+  <string name="ignore_doze_permission_desc">Android kan je synchronisatie na een tijdje stoppen. Om dit te voorkomen kan je batterijoptimalisatie uitschakelen\n\nOp sommige apparaten staan extra apps voor beëindigen van taken, voeg Syncthing ook aan hun witte lijsten toe.</string>
-  <string name="dialog_disable_battery_optimization_later">Later</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Niet meer tonen</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Uitschakelen voor Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Je apparaat biedt geen ondersteuning voor het uitschakelen van batterijoptimalisatie</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-nn/strings.xml

@@ -24,7 +24,6 @@
   <string name="no">Nei</string>
   <string name="open_website">Opne nettstad</string>
   <string name="toast_write_storage_permission_required">Løyve til å skrive data er naudsynt for å bruke appen</string>
-  <string name="dialog_disable_battery_optimization_later">Seinare</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Laster…</string>

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

@@ -30,11 +30,8 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <string name="no">Nie</string>
   <string name="open_website">Otwórz stronę internetową</string>
   <string name="toast_write_storage_permission_required">Wymagane zezwolenie na zapisywanie do pamięci zewnętrznej</string>
-  <string name="dialog_disable_battery_optimization_title">Optymalizacja akumulatora</string>
+  <string name="ignore_doze_permission_title">Optymalizacja akumulatora</string>
-  <string name="dialog_disable_battery_optimization_message">Android może wstrzymać synchronizację po pewnym czasie. By temu zapobiedz, wyłącz optymalizację baterii.\n\nNiektóre urządzenia posiadają dodatkowe preinstalowane aplikacje zatrzymujące zadania - dobrze byłoby dopisać Syncthing do listy ich wyjątków.</string>
+  <string name="ignore_doze_permission_desc">Android może wstrzymać synchronizację po pewnym czasie. By temu zapobiedz, wyłącz optymalizację baterii.\n\nNiektóre urządzenia posiadają dodatkowe preinstalowane aplikacje zatrzymujące zadania - dobrze byłoby dopisać Syncthing do listy ich wyjątków.</string>
-  <string name="dialog_disable_battery_optimization_later">Później</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Nie pokazuj ponownie</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Wyłącz dla Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Twoje urządzenie nie wspiera wyłączania optymalizacji baterii</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-pt-rBR/strings.xml

@@ -31,11 +31,8 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <string name="no">Não</string>
   <string name="open_website">Abrir site</string>
   <string name="toast_write_storage_permission_required">A permissão de escrita em armazenamento é obrigatória para este aplicativo</string>
-  <string name="dialog_disable_battery_optimization_title">Otimização de bateria</string>
+  <string name="ignore_doze_permission_title">Otimização de bateria</string>
-  <string name="dialog_disable_battery_optimization_message">O Android poder parar a sincronização após algum tempo. Para evitar isto, desabilite a otimização de bateria.\n\nAlguns dispositivos possuem  aplicativos para \"matar\" tarefas. Você também deve adicionar o Syncthing às listas brancas deles.</string>
+  <string name="ignore_doze_permission_desc">O Android poder parar a sincronização após algum tempo. Para evitar isto, desabilite a otimização de bateria.\n\nAlguns dispositivos possuem  aplicativos para \"matar\" tarefas. Você também deve adicionar o Syncthing às listas brancas deles.</string>
-  <string name="dialog_disable_battery_optimization_later">Depois</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Não mostrar novamente</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Desligar para o Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Seu dispositivo não suporta a desativação das otimizações de bateria</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

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

@@ -29,11 +29,8 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <string name="no">Não</string>
   <string name="open_website">Abrir Website</string>
   <string name="toast_write_storage_permission_required">Esta aplicação precisa de permissão de escrita no armazenamento</string>
-  <string name="dialog_disable_battery_optimization_title">Optimização da bateria</string>
+  <string name="ignore_doze_permission_title">Optimização da bateria</string>
-  <string name="dialog_disable_battery_optimization_message">O Android pode parar a sincronização passado algum tempo. Para prevenir isso, desligue a optimização da bateria.\n\nAlguns dispositivos têm aplicações adicionais pré-instaladas para matar tarefas. Deve adicionar o Syncthing à lista de excepções dessas aplicações.</string>
+  <string name="ignore_doze_permission_desc">O Android pode parar a sincronização passado algum tempo. Para prevenir isso, desligue a optimização da bateria.\n\nAlguns dispositivos têm aplicações adicionais pré-instaladas para matar tarefas. Deve adicionar o Syncthing à lista de excepções dessas aplicações.</string>
-  <string name="dialog_disable_battery_optimization_later">Mais tarde</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Não apresentar novamente</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Desligar para o Syncthing</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Carregando...</string>

app/src/main/res/values-ro/strings.xml

@@ -34,11 +34,8 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <string name="toast_write_storage_permission_required">Permisiunea de scriere pe spațiul de stocare este necesară acestei aplicații</string>
   <string name="device_rejected">Dispozitivul \"%1$s\" dorește să se conecteze</string>
   <string name="folder_rejected">Dispozitivul \"%1$s\" dorește să partajeze directorul \"%2$s\"</string>
-  <string name="dialog_disable_battery_optimization_title">Optimizare baterie</string>
+  <string name="ignore_doze_permission_title">Optimizare baterie</string>
-  <string name="dialog_disable_battery_optimization_message">Android poate oprii sincronizarea după un timp. Pentru a prevenii asta, opriți optimizarea bateriei.\n\nUnele dispozitive au aplicații adiționale preinstalate care pot oprii aplicațiile. Ar trebui să adăugați Syncthing și în listele lor de excepții.</string>
+  <string name="ignore_doze_permission_desc">Android poate oprii sincronizarea după un timp. Pentru a prevenii asta, opriți optimizarea bateriei.\n\nUnele dispozitive au aplicații adiționale preinstalate care pot oprii aplicațiile. Ar trebui să adăugați Syncthing și în listele lor de excepții.</string>
-  <string name="dialog_disable_battery_optimization_later">Mai târziu </string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Nu mai afișa </string>
-  <string name="dialog_disable_battery_optimization_turn_off">Închide Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Dispozitivul dumneavoastră nu suportă dezactivarea optimizărilor de baterie</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-ru/strings.xml

@@ -31,11 +31,8 @@
   <string name="no">Нет</string>
   <string name="open_website">Открыть сайт</string>
   <string name="toast_write_storage_permission_required">Приложению требуется право на запись</string>
-  <string name="dialog_disable_battery_optimization_title">Оптимизация батареи</string>
+  <string name="ignore_doze_permission_title">Оптимизация батареи</string>
-  <string name="dialog_disable_battery_optimization_message">Android может остановить синхронизацию через определенное время. Чтобы избежать этого, отключите энергосбережение в режиме ожидания.\n\nТакже, если на вашем устройстве установлена программа для автоматического завершения приложений, внесите Syncthing в её список исключений.</string>
+  <string name="ignore_doze_permission_desc">Android может остановить синхронизацию через определенное время. Чтобы избежать этого, отключите энергосбережение в режиме ожидания.\n\nТакже, если на вашем устройстве установлена программа для автоматического завершения приложений, внесите Syncthing в её список исключений.</string>
-  <string name="dialog_disable_battery_optimization_later">Позже</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Больше не показывать</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Отключить для Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Ваше устройство не поддерживает отключение энергосбережения</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

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

@@ -24,7 +24,6 @@
   <string name="no">Nie</string>
   <string name="open_website">Otvoriť Webovú Stránku</string>
   <string name="toast_write_storage_permission_required">Táto aplikácia potrebuje práva pre zápis na úložisko</string>
-  <string name="dialog_disable_battery_optimization_later">Neskôr</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Načítavam...</string>

app/src/main/res/values-sv/strings.xml

@@ -34,11 +34,8 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="toast_write_storage_permission_required">Skrivlagringstillstånd krävs för denna applikation</string>
   <string name="device_rejected">Enhet \"%1$s\" vill ansluta</string>
   <string name="folder_rejected">Enhet \"%1$s\" vill dela mapp \"%2$s\"</string>
-  <string name="dialog_disable_battery_optimization_title">Batterioptimering</string>
+  <string name="ignore_doze_permission_title">Batterioptimering</string>
-  <string name="dialog_disable_battery_optimization_message">Android kan stoppa synkronisering efter en viss tid. För att förhindra detta, stäng av batterioptimering.\n\nNågra enheter har ytterligare uppgiftsdödande appar förinstallerade. Ni bör lägga till Syncthing till deras vitlista, också.</string>
+  <string name="ignore_doze_permission_desc">Android kan stoppa synkronisering efter en viss tid. För att förhindra detta, stäng av batterioptimering.\n\nNågra enheter har ytterligare uppgiftsdödande appar förinstallerade. Ni bör lägga till Syncthing till deras vitlista, också.</string>
-  <string name="dialog_disable_battery_optimization_later">Senare</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Visa inte igen</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Stäng av för Syncthing</string>
   <string name="dialog_disable_battery_optimizations_not_supported">Din enhet har inte stöd för att inaktivera batterioptimeringar</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-tr/strings.xml

@@ -29,11 +29,8 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <string name="no">Hayır</string>
   <string name="open_website">Web sitesini aç</string>
   <string name="toast_write_storage_permission_required">Bu uygulama için belleğe yazma yetkisi gerekmektedir.</string>
-  <string name="dialog_disable_battery_optimization_title">Batarya İyileştirme</string>
+  <string name="ignore_doze_permission_title">Batarya İyileştirme</string>
-  <string name="dialog_disable_battery_optimization_message">Android, birkaç zaman sonra eşzamanlamayı durdurabilir. Bunu önlemek için batarya iyileştirmesini kapat.\n\nBazı aygıtlar ek olarak görev bitirme uygulamalarıyla yüklü gelir. Syncthing\'i onların beyaz listesine ayrıca eklemelisiniz.</string>
+  <string name="ignore_doze_permission_desc">Android, birkaç zaman sonra eşzamanlamayı durdurabilir. Bunu önlemek için batarya iyileştirmesini kapat.\n\nBazı aygıtlar ek olarak görev bitirme uygulamalarıyla yüklü gelir. Syncthing\'i onların beyaz listesine ayrıca eklemelisiniz.</string>
-  <string name="dialog_disable_battery_optimization_later">Daha sonra</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Yeniden gösterme</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Syncthing için kapat</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Yükleniyor...</string>

app/src/main/res/values-uk/strings.xml

@@ -21,9 +21,6 @@
   <string name="no">Ні</string>
   <string name="open_website">Відкрити сайт</string>
   <string name="toast_write_storage_permission_required">Додаток потребує прав на запис на носій(картку)</string>
-  <string name="dialog_disable_battery_optimization_later">Пізніше</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">Більше не відображати</string>
-  <string name="dialog_disable_battery_optimization_turn_off">Вимкнути для Syncthing</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Завантажується...</string>

app/src/main/res/values-vi/strings.xml

@@ -25,7 +25,6 @@
   <string name="no">Không</string>
   <string name="open_website">Mở trang web</string>
   <string name="toast_write_storage_permission_required">Ứng dụng này cần được phép chép vào ổ lưu trữ</string>
-  <string name="dialog_disable_battery_optimization_later">Để sau</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Đang tải...</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -30,13 +30,10 @@
   <string name="no">否</string>
   <string name="open_website">打开主页</string>
   <string name="toast_write_storage_permission_required">本应用需要写存储的权限</string>
-  <string name="dialog_disable_battery_optimization_title">电池优化</string>
+  <string name="ignore_doze_permission_title">电池优化</string>
-  <string name="dialog_disable_battery_optimization_message">Android 可能会在一段时间后停止同步。为防这种情况，请关闭电池优化。
+  <string name="ignore_doze_permission_desc">Android 可能会在一段时间后停止同步。为防这种情况，请关闭电池优化。
 
 有些设备预装了额外的查杀任务应用。您也应该添加 Syncthing 到他们的白名单上。</string>
-  <string name="dialog_disable_battery_optimization_later">稍后重启</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">不再显示</string>
-  <string name="dialog_disable_battery_optimization_turn_off">为 Syncthing 关闭</string>
   <string name="dialog_disable_battery_optimizations_not_supported">您的设备不支持禁用电池优化</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values-zh-rTW/strings.xml

@@ -29,11 +29,8 @@
   <string name="no">否</string>
   <string name="open_website">打開網站</string>
   <string name="toast_write_storage_permission_required">應用程式需要寫入儲存空間的權限</string>
-  <string name="dialog_disable_battery_optimization_title">電池最佳化</string>
+  <string name="ignore_doze_permission_title">電池最佳化</string>
-  <string name="dialog_disable_battery_optimization_message">Android 也許會在一段時間後停止同步。為了防止這個情形，關閉電池最佳化。\n\n有些裝置會預載額外的工作清除應用程式，你也需把 Syncthing 加入白名單中。</string>
+  <string name="ignore_doze_permission_desc">Android 也許會在一段時間後停止同步。為了防止這個情形，關閉電池最佳化。\n\n有些裝置會預載額外的工作清除應用程式，你也需把 Syncthing 加入白名單中。</string>
-  <string name="dialog_disable_battery_optimization_later">稍後</string>
-  <string name="dialog_disable_battery_optimization_dont_show_again">別再顯示</string>
-  <string name="dialog_disable_battery_optimization_turn_off">對 Syncthing 關閉</string>
   <string name="dialog_disable_battery_optimizations_not_supported">你的裝置不支援停用電池最佳化</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->

app/src/main/res/values/colors.xml

@@ -17,24 +17,28 @@
     <color name="bg_screen2">#20d2bb</color>
     <color name="bg_screen3">#c873f4</color>
     <color name="bg_screen4">#5e7c8b</color>
+    <color name="bg_screen5">#3d4db7</color>
 
     <!-- dots inactive colors -->
     <color name="dot_dark_screen1">#2278d4</color>
     <color name="dot_dark_screen2">#14a895</color>
     <color name="dot_dark_screen3">#a854d4</color>
     <color name="dot_dark_screen4">#3e5c6b</color>
+    <color name="dot_dark_screen5">#1d2d97</color>
 
     <!-- dots active colors -->
     <color name="dot_light_screen1">#93c6fd</color>
     <color name="dot_light_screen2">#8cf9eb</color>
     <color name="dot_light_screen3">#e4b5fc</color>
     <color name="dot_light_screen4">#8eacbb</color>
+    <color name="dot_light_screen5">#6d7de7</color>
 
     <array name="array_dot_active">
         <item>@color/dot_light_screen1</item>
         <item>@color/dot_light_screen2</item>
         <item>@color/dot_light_screen3</item>
         <item>@color/dot_light_screen4</item>
+        <item>@color/dot_light_screen5</item>
     </array>
 
     <array name="array_dot_inactive">
@@ -42,6 +46,7 @@
         <item>@color/dot_dark_screen2</item>
         <item>@color/dot_dark_screen3</item>
         <item>@color/dot_dark_screen4</item>
+        <item>@color/dot_dark_screen5</item>
     </array>
     <!-- FirstStartActivity welcome wizard end -->
 </resources>

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

@@ -73,11 +73,9 @@ Please report any problems you encounter via Github.</string>
 
     <string name="folder_rejected">Device \"%1$s\" wants to share folder \"%2$s\"</string>
 
-    <string name="dialog_disable_battery_optimization_title">Battery Optimization</string>
+    <string name="ignore_doze_permission_title">Battery Optimization</string>
-    <string name="dialog_disable_battery_optimization_message">Android may stop synchronization after some time. To prevent this, turn off battery optimization.\n\nSome devices have additional task-killing apps preinstalled. You should add Syncthing to their whitelist, as well.</string>
+    <string name="ignore_doze_permission_desc">Android may stop synchronization after some time. To prevent this, turn off battery optimization.\n\nSome devices have additional task-killing apps preinstalled. You should add Syncthing to their whitelist, as well.</string>
-    <string name="dialog_disable_battery_optimization_later">Later</string>
+    <string name="toast_ignore_doze_permission_required">This app only works reliably if it is exempted from \"doze\" power save mode.</string>
-    <string name="dialog_disable_battery_optimization_dont_show_again">Don\'t show again</string>
-    <string name="dialog_disable_battery_optimization_turn_off">Turn off for Syncthing</string>
     <string name="dialog_disable_battery_optimizations_not_supported">Your device does not support disabling battery optimizations</string>
 
     <!-- StateDialogActivity -->