Merge pull request #358 from chirayudesai/suw-redesign-1

Don't hide navigation bar in setup wizard
2022-01-04 17:29:28 -03:00 · 2022-01-04 17:29:28 -03:00 · 129f8d90e5
commit 129f8d90e5
parent efaeaa56ad 08610e1332
39 changed files with 61 additions and 89 deletions
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt
@ -21,8 +21,6 @@ class RestoreActivity : RequireProvisioningActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        if (isSetupWizard) hideSystemUiNavigation()
-
        setContentView(R.layout.activity_fragment_container)

        viewModel.displayFragment.observeEvent(this, { fragment ->
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt
@ -1,7 +1,6 @@
 package com.stevesoltys.seedvault.ui

 import android.view.MenuItem
-import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@ -25,8 +24,4 @@ abstract class BackupActivity : AppCompatActivity() {
        fragmentTransaction.commit()
    }

-    protected fun hideSystemUiNavigation() {
-        window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
-    }
-
 }
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
@ -23,6 +23,7 @@ abstract class RequireProvisioningActivity : BackupActivity() {

    private val recoveryCodeRequest =
        registerForActivityResult(StartActivityForResult()) { result ->
+            setResult(result.resultCode)
            if (result.resultCode != RESULT_OK) {
                Log.w(TAG, "Error in activity result for requesting recovery code")
                if (!getViewModel().recoveryCodeIsSet()) {
@ -32,6 +33,7 @@ abstract class RequireProvisioningActivity : BackupActivity() {
        }
    private val requestLocation =
        registerForActivityResult(StartActivityForResult()) { result ->
+            setResult(result.resultCode)
            if (result.resultCode != RESULT_OK) {
                Log.w(TAG, "Error in activity result for requesting location")
                if (!getViewModel().validLocationIsSet()) {
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt
@ -6,7 +6,6 @@ import android.view.WindowManager.LayoutParams.FLAG_SECURE
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.BackupActivity
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
-import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD
 import org.koin.androidx.viewmodel.ext.android.viewModel

 class RecoveryCodeActivity : BackupActivity() {
@ -16,7 +15,6 @@ class RecoveryCodeActivity : BackupActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        if (isSetupWizard()) hideSystemUiNavigation()
        window.addFlags(FLAG_SECURE)

        setContentView(R.layout.activity_recovery_code)
@ -66,8 +64,4 @@ class RecoveryCodeActivity : BackupActivity() {
        return intent?.getBooleanExtra(INTENT_EXTRA_IS_RESTORE, false) ?: false
    }

-    private fun isSetupWizard(): Boolean {
-        return intent?.getBooleanExtra(INTENT_EXTRA_IS_SETUP_WIZARD, false) ?: false
-    }
-
 }
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
@ -46,7 +46,6 @@ class RecoveryCodeInputFragment : Fragment() {
    private lateinit var introText: TextView
    private lateinit var doneButton: Button
    private lateinit var newCodeButton: Button
-    private lateinit var backView: TextView
    private lateinit var wordLayout1: TextInputLayout
    private lateinit var wordLayout2: TextInputLayout
    private lateinit var wordLayout3: TextInputLayout
@ -76,7 +75,6 @@ class RecoveryCodeInputFragment : Fragment() {
        introText = v.findViewById(R.id.introText)
        doneButton = v.findViewById(R.id.doneButton)
        newCodeButton = v.findViewById(R.id.newCodeButton)
-        backView = v.findViewById(R.id.backView)
        wordLayout1 = v.findViewById(R.id.wordLayout1)
        wordLayout2 = v.findViewById(R.id.wordLayout2)
        wordLayout3 = v.findViewById(R.id.wordLayout3)
@ -105,8 +103,6 @@ class RecoveryCodeInputFragment : Fragment() {

        if (viewModel.isRestore) {
            introText.setText(R.string.recovery_code_input_intro)
-            backView.visibility = VISIBLE
-            backView.setOnClickListener { requireActivity().finishAfterTransition() }
        }

        val adapterLayout = android.R.layout.simple_list_item_1
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt
@ -47,8 +47,6 @@ class StorageActivity : BackupActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        if (isSetupWizard()) hideSystemUiNavigation()
-
        setContentView(R.layout.activity_fragment_container)

        viewModel = if (isRestore()) {
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt
@ -1,6 +1,7 @@
 package com.stevesoltys.seedvault.ui.storage

 import android.Manifest.permission.MANAGE_DOCUMENTS
+import android.app.Activity.RESULT_FIRST_USER
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
@ -45,7 +46,7 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener {
    private lateinit var divider: View
    private lateinit var listView: RecyclerView
    private lateinit var progressBar: ProgressBar
-    private lateinit var backView: TextView
+    private lateinit var skipView: TextView

    private val adapter by lazy { StorageRootAdapter(viewModel.isRestoreOperation, this) }

@ -62,7 +63,7 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener {
        divider = v.findViewById(R.id.divider)
        listView = v.findViewById(R.id.listView)
        progressBar = v.findViewById(R.id.progressBar)
-        backView = v.findViewById(R.id.backView)
+        skipView = v.findViewById(R.id.skipView)

        return v
    }
@ -78,8 +79,13 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener {

        if (viewModel.isRestoreOperation) {
            titleView.text = getString(R.string.storage_fragment_restore_title)
-            backView.visibility = VISIBLE
-            backView.setOnClickListener { requireActivity().finishAfterTransition() }
+            skipView.visibility = VISIBLE
+            skipView.setOnClickListener {
+                // Equivalent to com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
+                // SetupWizard handles this
+                requireActivity().setResult(RESULT_FIRST_USER)
+                requireActivity().finishAfterTransition()
+            }
        } else {
            warningIcon.visibility = VISIBLE
            if (viewModel.hasStorageSet) {
--- a/app/src/main/res/layout/fragment_recovery_code_input.xml
+++ b/app/src/main/res/layout/fragment_recovery_code_input.xml
@ -71,23 +71,6 @@
            app:layout_constraintEnd_toStartOf="@+id/newCodeButton"
            app:layout_constraintStart_toStartOf="parent" />

-        <TextView
-            android:id="@+id/backView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?android:selectableItemBackground"
-            android:padding="16dp"
-            android:text="@string/restore_back"
-            android:textColor="?android:colorAccent"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/doneButton"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/wordList"
-            app:layout_constraintVertical_bias="1.0"
-            tools:visibility="visible" />
-
        <Button
            android:id="@+id/newCodeButton"
            style="@style/Widget.AppCompat.Button.Borderless"
--- a/app/src/main/res/layout/fragment_restore_set.xml
+++ b/app/src/main/res/layout/fragment_restore_set.xml
@ -73,7 +73,7 @@
        android:layout_height="wrap_content"
        android:background="?android:selectableItemBackground"
        android:padding="16dp"
-        android:text="@string/restore_skip"
+        android:text="@string/restore_skip_apps"
        android:textColor="?android:colorAccent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
--- a/app/src/main/res/layout/fragment_storage_root.xml
+++ b/app/src/main/res/layout/fragment_storage_root.xml
@ -75,7 +75,7 @@
        android:layout_width="match_parent"
        android:layout_height="0dp"
        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toTopOf="@+id/backView"
+        app:layout_constraintBottom_toTopOf="@+id/skipView"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/divider"
@ -87,18 +87,18 @@
        style="?android:progressBarStyleLarge"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/backView"
+        app:layout_constraintBottom_toTopOf="@+id/skipView"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/titleView" />

    <TextView
-        android:id="@+id/backView"
+        android:id="@+id/skipView"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="?android:selectableItemBackground"
        android:padding="16dp"
-        android:text="@string/restore_back"
+        android:text="@string/restore_skip"
        android:textColor="?android:colorAccent"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -34,7 +34,7 @@
 \n
 \nVyberte prosím jiné umístění, které obsahuje složku %s.</string>
    <string name="restore_invalid_location_title">Nebyly nalezeny žádné zálohy</string>
-    <string name="restore_back">Neobnovovat</string>
+    <string name="restore_skip">Neobnovovat</string>
    <string name="restore_restore_set_times">Poslední záloha %1$s – První %2$s.</string>
    <string name="restore_choose_restore_set">Výběr zálohy pro obnovení</string>
    <string name="restore_title">Obnovení ze zálohy</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -102,7 +102,7 @@
 \n
 \nWähle einen anderen Speicherort aus, der einen %s Ordner enthält.</string>
    <string name="restore_invalid_location_title">Keine Sicherungen gefunden</string>
-    <string name="restore_back">Nicht wiederherstellen</string>
+    <string name="restore_skip">Nicht wiederherstellen</string>
    <string name="restore_restore_set_times">Letzte Sicherung %1$s · Erste %2$s.</string>
    <string name="restore_choose_restore_set">Wähle eine Sicherung aus, um sie wiederherzustellen</string>
    <string name="notification_restore_error_action">App deinstallieren</string>
@ -152,7 +152,7 @@
    <string name="restore_storage_in_progress_title">Dateien werden wiederhergestellt…</string>
    <string name="restore_storage_choose_snapshot">Wähle eine Speichersicherung zum Wiederherstellen aus (experimentell)</string>
    <string name="restore_storage_skip">Wiederherstellen von Dateien überspringen</string>
-    <string name="restore_skip">Wiederherstellen von Apps überspringen</string>
+    <string name="restore_skip_apps">Wiederherstellen von Apps überspringen</string>
    <string name="recovery_code_auth_description">Eingabe deiner Geräteanmeldedaten zum Fortfahren</string>
    <string name="recovery_code_auth_title">Deine Bildschirmsperre erneut eingeben</string>
    <string name="storage_check_fragment_patience">Das kann einige Zeit dauern…</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -61,7 +61,7 @@
 \n
 \nΕπιλέξτε άλλη τοποθεσία που περιέχει ένα φάκελο %s.</string>
    <string name="restore_invalid_location_title">Δεν βρέθηκαν αντίγραφα ασφαλείας</string>
-    <string name="restore_back">Να μην γίνει επαναφορά</string>
+    <string name="restore_skip">Να μην γίνει επαναφορά</string>
    <string name="restore_restore_set_times">Τελευταίο αντίγραφο ασφαλείας %1$s · Πρώτο %2$s.</string>
    <string name="restore_choose_restore_set">Επιλέξτε ένα αντίγραφο ασφαλείας για επαναφορά</string>
    <string name="restore_title">Επαναφορά από αντίγραφο ασφαλείας</string>
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@ -30,7 +30,7 @@
 \n
 \nElija otra ubicación que contenga una carpeta %s.</string>
    <string name="restore_invalid_location_title">No se encontraron respaldos</string>
-    <string name="restore_back">No restaurar</string>
+    <string name="restore_skip">No restaurar</string>
    <string name="restore_restore_set_times">Último Respaldo %1$s · Primero %2$s.</string>
    <string name="restore_choose_restore_set">Elije un respaldo para restaurar</string>
    <string name="restore_title">Restaurar desde el respaldo</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -7,7 +7,7 @@
    <string name="storage_internal_warning_title">Atención</string>
    <string name="restore_finished_button">Finalizar</string>
    <string name="restore_next">Siguiente</string>
-    <string name="restore_back">No restaurar</string>
+    <string name="restore_skip">No restaurar</string>
    <string name="notification_restore_error_action">Desinstalar aplicación</string>
    <string name="notification_error_channel_title">Notificación de error</string>
    <string name="recovery_code_error_empty_word">Olvidaste escribir esta palabra.</string>
@ -166,7 +166,7 @@
    <string name="settings_backup_storage_dialog_title">Característica experimental</string>
    <string name="settings_backup_storage_dialog_message">La copia de seguridad de los archivos es todavía experimental y podría no funcionar. No confíe en ella para los datos importantes.</string>
    <string name="storage_fake_nextcloud_summary_unavailable_market">No instalada</string>
-    <string name="restore_skip">Omitir la restauración de apps</string>
+    <string name="restore_skip_apps">Omitir la restauración de apps</string>
    <string name="restore_storage_choose_snapshot">Elija una copia de seguridad de almacenamiento para restaurar (experimental)</string>
    <string name="restore_storage_in_progress_info">Sus archivos se están restaurando en segundo plano. Puede empezar a usar su teléfono mientras se está ejecutando.
 \n
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -35,7 +35,7 @@
 \n
 \nValitse toinen sijainti, joka sisältää %s-kansion.</string>
    <string name="restore_invalid_location_title">Varmuuskopioita ei löytynyt</string>
-    <string name="restore_back">Älä palauta</string>
+    <string name="restore_skip">Älä palauta</string>
    <string name="restore_restore_set_times">Viimeinen varmuuskopio %1$s · Ensimmäinen %2$s.</string>
    <string name="restore_choose_restore_set">Valitse palautettava varmuuskopio</string>
    <string name="restore_title">Palauta varmuuskopiosta</string>
@ -158,7 +158,7 @@
    <string name="settings_backup_storage_dialog_ok">Ota käyttöön joka tapauksessa</string>
    <string name="settings_expert_quota_title">Rajoittamaton sovelluskiintiö</string>
    <string name="settings_expert_title">Asiantuntija-asetukset</string>
-    <string name="restore_skip">Ohita sovellusten palauttaminen</string>
+    <string name="restore_skip_apps">Ohita sovellusten palauttaminen</string>
    <string name="restore_storage_skip">Ohita tiedostojen palauttaminen</string>
    <string name="restore_storage_choose_snapshot">Valitse palautettava tallennustilan varmuuskopio (kokeellinen)</string>
    <string name="restore_storage_in_progress_info">Tiedostojasi palautetaan taustalla. Voit aloittaa puhelimen käytön sen ollessa käynnissä.
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -12,7 +12,7 @@
    <string name="storage_internal_warning_title">Avertissement</string>
    <string name="restore_finished_button">Finir</string>
    <string name="restore_next">Suivant</string>
-    <string name="restore_back">Ne pas restaurer</string>
+    <string name="restore_skip">Ne pas restaurer</string>
    <string name="notification_error_action">Réparer</string>
    <string name="notification_channel_title">Notification de la sauvegarde</string>
    <string name="recovery_code_error_checksum_word">Votre code n\'est pas valide. Veuillez vérifier que tous les mots sont corrects et dans l\'ordre, puis réessayez.</string>
@ -166,7 +166,7 @@
 \nCertaines applications (par exemple, Signal ou WhatsApp) peuvent exiger que les fichiers soient entièrement restaurés avant d\'importer une sauvegarde. Essayez d\'éviter de démarrer ces applications avant que la restauration des fichiers ne soit terminée.</string>
    <string name="restore_storage_choose_snapshot">Choisir une sauvegarde de fichiers à restaurer (expérimental)</string>
    <string name="restore_storage_got_it">Compris</string>
-    <string name="restore_skip">Ne pas restaurer les applications</string>
+    <string name="restore_skip_apps">Ne pas restaurer les applications</string>
    <string name="restore_storage_skip">Ne pas restaurer les fichiers</string>
    <string name="restore_storage_in_progress_title">Restauration des fichiers…</string>
    <string name="recovery_code_auth_description">Saisissez vos identifiants pour continer</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -55,7 +55,7 @@
 \n
 \nנא לבחור במיקום אחר שמכיל תיקיית %s.</string>
    <string name="restore_invalid_location_title">לא נמצאו גיבויים</string>
-    <string name="restore_back">לא לשחזר</string>
+    <string name="restore_skip">לא לשחזר</string>
    <string name="restore_restore_set_times">גיבוי אחרון %1$s · ראשון %2$s.</string>
    <string name="restore_choose_restore_set">נא לבחור גיבוי לשחזור</string>
    <string name="restore_title">שחזור מגיבוי</string>
@ -138,7 +138,7 @@
    <string name="recovery_code_verification_new_dialog_title">נא להמתין רגע קט…</string>
    <string name="recovery_code_auth_title">נא להיכנס מחדש למסך הנעילה שלך</string>
    <string name="recovery_code_auth_description">נא לספק את פרטי הגישה למכשיר כדי להמשיך</string>
-    <string name="restore_skip">דילוג על שחזור יישומונים</string>
+    <string name="restore_skip_apps">דילוג על שחזור יישומונים</string>
    <string name="backup_app_quota_exceeded">מיכסת הגיבוי הושגה</string>
    <string name="restore_restoring_error_message">אפשר להתקין את היישומונים האלה ידנית מחדש והשחזור האוטומטי ינסה לשחזר את הנתונים שלהם (אם הוא מופעל).</string>
    <string name="settings_backup_recovery_code_summary">אימות קוד קיים או יצירת אחד חדש</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -32,7 +32,7 @@
 \n
 \nOdaberi jedno drugo mjesto koje sadrži %s mapu.</string>
    <string name="restore_invalid_location_title">Nema sigurnosnih kopija</string>
-    <string name="restore_back">Nemoj vratiti</string>
+    <string name="restore_skip">Nemoj vratiti</string>
    <string name="restore_restore_set_times">Zadnja sigurnosna kopija %1$s · Prva %2$s.</string>
    <string name="restore_choose_restore_set">Odaberi sigurnosnu kopiju za vraćanje</string>
    <string name="restore_title">Vrati iz sigurnosne kopije</string>
@ -138,7 +138,7 @@
    <string name="recovery_code_auth_description">Nastavi upisom svojih podataka za prijavu</string>
    <string name="recovery_code_auth_title">Ponovo upiši podatke za zaključavanje ekrana</string>
    <string name="backup_section_not_allowed">Aplikacije koje ne dopuštaju spremanje sigurnosne kopije</string>
-    <string name="restore_skip">Preskoči obnavljanje aplikacija</string>
+    <string name="restore_skip_apps">Preskoči obnavljanje aplikacija</string>
    <string name="restore_storage_skip">Preskoči obnavljanje datoteka</string>
    <string name="restore_storage_choose_snapshot">Odaberi spremište sigurnosnih kopija za obnavljanje (eksperimentalno)</string>
    <string name="restore_storage_in_progress_title">Datoteke se obnavljaju …</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -30,7 +30,7 @@
    <string name="restore_finished_success">Pemulihan selesai</string>
    <string name="restore_restoring">Memulihkan pencadangan</string>
    <string name="restore_installing_packages">Pasang ulang apl</string>
-    <string name="restore_back">Jangan pulihkan</string>
+    <string name="restore_skip">Jangan pulihkan</string>
    <string name="notification_restore_error_action">Copot apl</string>
    <string name="notification_error_title">Pencadangan galat</string>
    <string name="notification_error_channel_title">Pemberitahuan galat</string>
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@ -30,7 +30,7 @@
 \n
 \nVinsamlegast veldu annan afritageymslustað sem býður upp á %s möppu.</string>
    <string name="restore_invalid_location_title">Engin öryggisafrit fundust</string>
-    <string name="restore_back">Ekki endurvekja</string>
+    <string name="restore_skip">Ekki endurvekja</string>
    <string name="restore_restore_set_times">Síðasta öryggisafrit %1$s · Fyrsta %2$s.</string>
    <string name="restore_choose_restore_set">Veldu öryggisafrit til að endurvekja</string>
    <string name="restore_title">Endurvekja úr öryggisafriti</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -97,7 +97,7 @@
 \n
 \nSi prega di scegliere un altro punto che contenga una %s cartella.</string>
    <string name="restore_invalid_location_title">Nessun backup trovato</string>
-    <string name="restore_back">Non ripristinare</string>
+    <string name="restore_skip">Non ripristinare</string>
    <string name="restore_restore_set_times">Ultimo backup %1$s · Primo %2$s.</string>
    <string name="restore_choose_restore_set">Selezionare un backup da ripristinare</string>
    <string name="restore_title">Ripristino del backup</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -92,7 +92,7 @@
 \n
 \n%sフォルダを含む別の場所を選択してください。</string>
    <string name="restore_invalid_location_title">バックアップが見つかりません</string>
-    <string name="restore_back">復元しない</string>
+    <string name="restore_skip">復元しない</string>
    <string name="restore_restore_set_times">最後は%1$s · 最初は %2$s.</string>
    <string name="restore_choose_restore_set">復元するバックアップを選ぶ</string>
    <string name="backup_section_not_allowed">アプリはバックアップできません</string>
@ -163,7 +163,7 @@
    <string name="settings_category_apps">アプリのバックアップ</string>
    <string name="settings_backup_files_summary">なし</string>
    <string name="settings_backup_files_title">含まれるファイルとフォルダー</string>
-    <string name="restore_skip">アプリの復元をスキップする</string>
+    <string name="restore_skip_apps">アプリの復元をスキップする</string>
    <string name="restore_storage_in_progress_info">ファイルはバックグラウンドで復元されます。実行されている間、あなたは電話を使うことができます。
 \n
 \n一部のアプリ(SignalやWhatsAppなど)では、バックアップをインポートするためにファイルが完全に復元されるまで待つ必要があります。ファイルの復元が完了する前に、これらのアプリを起動しないようにしてください。</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -53,7 +53,7 @@
    <string name="about_title">정보</string>
    <string name="storage_internal_warning_title">경고</string>
    <string name="restore_next">다음</string>
-    <string name="restore_back">복원 안 함</string>
+    <string name="restore_skip">복원 안 함</string>
    <string name="notification_error_title">백업 오류</string>
    <string name="notification_error_channel_title">오류 알림</string>
    <string name="notification_failed_title">백업 실패</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -37,7 +37,7 @@
 \n
 \nPasirinkite kitą vietą, kurioje yra %s aplankas.</string>
    <string name="restore_invalid_location_title">Nerasta jokių atsarginių kopijų</string>
-    <string name="restore_back">Neatkurti</string>
+    <string name="restore_skip">Neatkurti</string>
    <string name="restore_restore_set_times">Paskutinė atsarginė kopija %1$s - Pirmoji %2$s.</string>
    <string name="restore_choose_restore_set">Pasirinkite atsarginę kopiją, kurią norite atkurti</string>
    <string name="restore_title">Atkurti iš atsarginės kopijos</string>
@ -154,7 +154,7 @@
    <string name="restore_storage_in_progress_title">Failai atkuriami…</string>
    <string name="restore_storage_got_it">Supratau</string>
    <string name="settings_backup_storage_title">Sukurti atsarginę mano failų kopiją</string>
-    <string name="restore_skip">Praleisti programėlių atkūrimą</string>
+    <string name="restore_skip_apps">Praleisti programėlių atkūrimą</string>
    <string name="settings_category_apps">Programėlių atsarginės kopijos</string>
    <string name="settings_backup_storage_dialog_title">Eksperimentinė funkcija</string>
    <string name="settings_backup_storage_dialog_message">Failų atsarginių kopijų kūrimas vis dar eksperimentinis ir gali neveikti. Nepasikliaukite ja, jei norite išsaugoti svarbius duomenis.</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -48,7 +48,7 @@
    <string name="restore_restoring">Gjenoppretting av sikkerhetskopi</string>
    <string name="restore_next">Neste</string>
    <string name="restore_invalid_location_title">Fant ingen sikkerhetskopier</string>
-    <string name="restore_back">Ikke gjenopprett</string>
+    <string name="restore_skip">Ikke gjenopprett</string>
    <string name="restore_restore_set_times">Siste sikkerhetskopi %1$s · Første %2$s.</string>
    <string name="restore_choose_restore_set">Velg en sikkerhetskopi å gjenopprette</string>
    <string name="restore_title">Gjenopprett fra sikkerhetskopi</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -125,7 +125,7 @@
 \n
 \nWybierz inne położenie, które zawiera katalog %s.</string>
    <string name="restore_invalid_location_title">Nie odnaleziono kopii zapasowych</string>
-    <string name="restore_back">Nie przywracaj</string>
+    <string name="restore_skip">Nie przywracaj</string>
    <string name="restore_restore_set_times">Ostatnia kopia zapasowa %1$s · Pierwsza %2$s.</string>
    <string name="restore_choose_restore_set">Wybierz kopię zapasową do przywrócenia</string>
    <string name="restore_title">Przywróć z kopii zapasowej</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -75,7 +75,7 @@
 \n
 \nEscolha outro local que contenha uma pasta %s.</string>
    <string name="restore_invalid_location_title">Sem backups encontrados</string>
-    <string name="restore_back">Não restaurar</string>
+    <string name="restore_skip">Não restaurar</string>
    <string name="restore_restore_set_times">Último backup %1$s · Primeiro %2$s.</string>
    <string name="restore_choose_restore_set">Escolha um backup para restaurar</string>
    <string name="restore_title">Restaurar do backup</string>
@ -154,7 +154,7 @@
 \n
 \nAviso: isso pode encher seu local de armazenamento rapidamente. Não é necessário para a maioria dos aplicativos.</string>
    <string name="storage_fake_nextcloud_summary_unavailable_market">Não instalado</string>
-    <string name="restore_skip">Pular restauração de aplicativos</string>
+    <string name="restore_skip_apps">Pular restauração de aplicativos</string>
    <string name="storage_fragment_warning_delete">Os backups existentes neste local serão excluídos.</string>
    <string name="settings_backup_files_title">Arquivos e pastas incluídos</string>
    <string name="storage_check_fragment_patience">Isto pode levar algum tempo…</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -37,7 +37,7 @@
 \n
 \nEscolha outro local que contenha uma pasta %s.</string>
    <string name="restore_invalid_location_title">Sem backups encontrados</string>
-    <string name="restore_back">Não restaurar</string>
+    <string name="restore_skip">Não restaurar</string>
    <string name="restore_restore_set_times">Último backup %1$s · Primeiro %2$s.</string>
    <string name="restore_choose_restore_set">Escolha um backup para restaurar</string>
    <string name="restore_title">Restaurar do backup</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -32,7 +32,7 @@
 \n
 \nEscolha outro local que contenha uma pasta %s.</string>
    <string name="restore_invalid_location_title">Sem backups encontrados</string>
-    <string name="restore_back">Não restaurar</string>
+    <string name="restore_skip">Não restaurar</string>
    <string name="restore_restore_set_times">Último backup %1$s · Primeiro %2$s.</string>
    <string name="restore_choose_restore_set">Escolha um backup para restaurar</string>
    <string name="restore_title">Restaurar do backup</string>
@ -164,7 +164,7 @@
    <string name="storage_check_fragment_patience">Isto pode levar algum tempo…</string>
    <string name="recovery_code_auth_title">Digite novamente o bloqueio de ecrã</string>
    <string name="recovery_code_auth_description">Digite as credenciais do seu aparelho para continuar</string>
-    <string name="restore_skip">Pular restauração de apps</string>
+    <string name="restore_skip_apps">Pular restauração de apps</string>
    <string name="restore_storage_skip">Pular restauração de ficheiros</string>
    <string name="restore_storage_choose_snapshot">Escolha um backup de armazenamento para restaurar (experimental)</string>
    <string name="restore_storage_in_progress_title">Os ficheiros estão sendo restaurados …</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -36,7 +36,7 @@
 \n
 \nПожалуйста, выберите другое расположение, содержащее папку %s.</string>
    <string name="restore_invalid_location_title">Резервные копии не найдены</string>
-    <string name="restore_back">Не восстанавливать</string>
+    <string name="restore_skip">Не восстанавливать</string>
    <string name="restore_restore_set_times">Последняя резервная копия %1$s · Первая %2$s.</string>
    <string name="restore_choose_restore_set">Выберите резервную копию для восстановления</string>
    <string name="restore_title">Восстановить из резервной копии</string>
@ -151,7 +151,7 @@
    <string name="settings_backup_storage_dialog_ok">Включить в любом случае</string>
    <string name="settings_expert_title">Продвинутые настройки</string>
    <string name="settings_expert_quota_title">Неограниченная квота приложений</string>
-    <string name="restore_skip">Пропустить восстановление приложений</string>
+    <string name="restore_skip_apps">Пропустить восстановление приложений</string>
    <string name="restore_storage_got_it">Есть</string>
    <string name="settings_category_apps">Резервное копирование приложений</string>
    <string name="restore_storage_skip">Пропустить восстановление файлов</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -48,7 +48,7 @@
 \n
 \nVyberte iné umiestnenie, ktoré obsahuje priečinok %s.</string>
    <string name="restore_invalid_location_title">Nenašli sa žiadne zálohy</string>
-    <string name="restore_back">Neobnovovať</string>
+    <string name="restore_skip">Neobnovovať</string>
    <string name="restore_restore_set_times">Posledná záloha %1$s · Prvá %2$s.</string>
    <string name="restore_choose_restore_set">Vyberte zálohu, ktorú chcete obnoviť</string>
    <string name="restore_title">Obnovenie zo zálohy</string>
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@ -34,7 +34,7 @@
 \nஇது பெரும்பாலும் தவறான மீட்பு குறியீடு அல்லது சேமிப்பக பிழை காரணமாக இருக்கலாம்.</string>
    <string name="restore_set_error">காப்புப்பிரதிகளை ஏற்றும்போது பிழை ஏற்பட்டது.</string>
    <string name="restore_invalid_location_title">காப்பு இல்லை</string>
-    <string name="restore_back">மீட்டெடுக்க வேண்டாம்</string>
+    <string name="restore_skip">மீட்டெடுக்க வேண்டாம்</string>
    <string name="restore_restore_set_times">கடைசி காப்பு %1$s · முதல் %2$s.</string>
    <string name="restore_choose_restore_set">மீட்டமைக்க ஒரு காப்புப்பிரதியைத் தேர்வு செய்யவும்</string>
    <string name="restore_title">காப்புப்பிரதியிலிருந்து மீட்டெடுக்கவும்</string>
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@ -123,7 +123,7 @@
 \n
 \nదయచేసి %s ఫోల్డర్ లో ఉన్న మరొక స్థానాన్ని ఎంచుకోండి.</string>
    <string name="restore_invalid_location_title">బ్యాకప్‌లు గుర్తించబడలేదు</string>
-    <string name="restore_back">పునరుద్ధరించవద్దు</string>
+    <string name="restore_skip">పునరుద్ధరించవద్దు</string>
    <string name="restore_restore_set_times">చివరి బ్యాకప్ %1$s· మొదటి %2$s.</string>
    <string name="restore_choose_restore_set">పునరుద్ధరించడానికి బ్యాకప్‌ని ఎంచుకోండి</string>
    <string name="restore_title">బ్యాకప్ నుండి పునరుద్ధరించండి</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -30,7 +30,7 @@
 \n
 \nLütfen %s klasörünü içeren başka bir konum seçin.</string>
    <string name="restore_invalid_location_title">Yedekleme bulunamadı</string>
-    <string name="restore_back">Geri yükleme</string>
+    <string name="restore_skip">Geri yükleme</string>
    <string name="restore_restore_set_times">Son yedekleme %1$s · İlk %2$s.</string>
    <string name="restore_choose_restore_set">Geri yüklemek için bir yedekleme seç</string>
    <string name="restore_title">Yedeklemeyi geri yükle</string>
@ -152,7 +152,7 @@
    <string name="restore_storage_in_progress_title">Dosyalar geri yükleniyor…</string>
    <string name="restore_storage_choose_snapshot">Geri yüklenecek bir depolama yedeklemesi seçin (deneysel)</string>
    <string name="restore_storage_skip">Dosyaları geri yüklemeyi atla</string>
-    <string name="restore_skip">Uygulamaları geri yüklemeyi atla</string>
+    <string name="restore_skip_apps">Uygulamaları geri yüklemeyi atla</string>
    <string name="recovery_code_auth_description">Devam etmek için aygıt kimlik bilgilerinizi girin</string>
    <string name="recovery_code_auth_title">Ekran kilidinizi tekrar girin</string>
    <string name="storage_check_fragment_patience">Bu biraz zaman alabilir…</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -69,7 +69,7 @@
 \n
 \nБудь ласка, виберіть інше розташування, що містить каталог %s.</string>
    <string name="restore_invalid_location_title">Резервні копії не знайдено</string>
-    <string name="restore_back">Не відновлювати</string>
+    <string name="restore_skip">Не відновлювати</string>
    <string name="restore_restore_set_times">Остання резервна копія %1$s · Перша %2$s.</string>
    <string name="restore_choose_restore_set">Виберіть резервну копію для відновлення</string>
    <string name="restore_title">Відновити з резервної копії</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -34,7 +34,7 @@
 \n
 \nVui lòng chọn một vị trí khác có chứa thư mục %s.</string>
    <string name="restore_invalid_location_title">Không tìm thấy bản sao lưu nào</string>
-    <string name="restore_back">Không khôi phục</string>
+    <string name="restore_skip">Không khôi phục</string>
    <string name="restore_restore_set_times">Sao lưu lần cuối %1$s · Lần đầu %2$s.</string>
    <string name="restore_choose_restore_set">Chọn bản sao lưu để khôi phục</string>
    <string name="restore_title">Khôi phục từ bản sao lưu</string>
@ -157,7 +157,7 @@
    <string name="storage_check_fragment_patience">Việc này có thể mất một ít thời gian…</string>
    <string name="recovery_code_auth_title">Nhập lại mã khoá màn hình</string>
    <string name="recovery_code_auth_description">Nhập thông tin mở khoá thiết bị để tiếp tục</string>
-    <string name="restore_skip">Bỏ qua khôi phục ứng dụng</string>
+    <string name="restore_skip_apps">Bỏ qua khôi phục ứng dụng</string>
    <string name="restore_storage_in_progress_title">Các tệp đang được khôi phục…</string>
    <string name="restore_storage_got_it">Hiểu rồi</string>
    <string name="settings_category_apps">Bản sao lưu ứng dụng</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -58,7 +58,7 @@
 \n
 \n请选择包含%s文件夹的其他位置。</string>
    <string name="restore_invalid_location_title">没有找到备份</string>
-    <string name="restore_back">不恢复</string>
+    <string name="restore_skip">不恢复</string>
    <string name="restore_restore_set_times">上次备份:%1$s · 首次备份:%2$s。</string>
    <string name="restore_choose_restore_set">选择一个备份来恢复</string>
    <string name="restore_title">从备份恢复</string>
@ -152,7 +152,7 @@
    <string name="restore_storage_in_progress_title">正在恢复文件…</string>
    <string name="restore_storage_choose_snapshot">选择要恢复的存储备份（实验性）</string>
    <string name="restore_storage_skip">跳过恢复文件</string>
-    <string name="restore_skip">跳过恢复应用程序</string>
+    <string name="restore_skip_apps">跳过恢复应用程序</string>
    <string name="recovery_code_auth_description">输入您的设备凭据以继续</string>
    <string name="recovery_code_auth_title">重新输入您的屏幕锁定码</string>
    <string name="storage_check_fragment_patience">这可能要花点时间…</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -148,8 +148,8 @@
    <string name="restore_title">Restore from backup</string>
    <string name="restore_choose_restore_set">Choose a backup to restore</string>
    <string name="restore_restore_set_times">Last backup %1$s · First %2$s.</string>
-    <string name="restore_back">Don\'t restore</string>
-    <string name="restore_skip">Skip restoring apps</string>
+    <string name="restore_skip">Don\'t restore</string>
+    <string name="restore_skip_apps">Skip restoring apps</string>
    <string name="restore_invalid_location_title">No backups found</string>
    <string name="restore_invalid_location_message">We could not find any backups at this location.\n\nPlease choose another location that contains a %s folder.</string>
    <string name="restore_set_error">An error occurred while loading the backups.</string>