diff options
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java | 11 | ||||
| -rw-r--r-- | src/main/res/layout/activity_import_backup.xml | 11 | ||||
| -rw-r--r-- | src/main/res/values-ar/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-bg/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-ca/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-es/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-fr/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-it/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-pl/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-ru/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
12 files changed, 23 insertions, 11 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java b/src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java index 5397eeaf2..5414e6bbf 100644 --- a/src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java @@ -81,7 +81,16 @@ public class ImportBackupActivity extends XmppActivity implements ServiceConnect @Override public void onBackupFilesLoaded(final List<ImportBackupService.BackupFile> files) { - runOnUiThread(() -> backupFileAdapter.setFiles(files)); + runOnUiThread(() -> { + if (files.size() >= 1) { + this.binding.hint.setVisibility(View.GONE); + this.binding.list.setVisibility(View.VISIBLE); + backupFileAdapter.setFiles(files); + } else { + this.binding.list.setVisibility(View.GONE); + this.binding.hint.setVisibility(View.VISIBLE); + } + }); } @Override diff --git a/src/main/res/layout/activity_import_backup.xml b/src/main/res/layout/activity_import_backup.xml index 7d12f78c9..996b9835a 100644 --- a/src/main/res/layout/activity_import_backup.xml +++ b/src/main/res/layout/activity_import_backup.xml @@ -39,6 +39,17 @@ android:background="?attr/color_background_tertiary" android:orientation="vertical" app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> + + <TextView + android:id="@+id/hint" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:padding="8dp" + android:text="@string/no_backup_available" + android:textAlignment="center" + android:textAppearance="@style/TextAppearance.Conversations.Body1" + android:visibility="gone" /> </android.support.design.widget.CoordinatorLayout> </LinearLayout> diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 6e006a717..71cfc7f31 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -368,7 +368,6 @@ <string name="registration_password_too_weak">فشلت عملية إنشاء الحساب: إنّ الكلمة السرية ضعيفة</string> <string name="choose_participants">اختر المشاركين</string> <string name="creating_conference">عملية انشاء فريق المحادثة جارية…</string> - <string name="import_text">إنّ جهازك يحتوي على نسخة احتياطية يمكنك استيرادها.\nسوف يتم إعادة تشغيل تطبيقك بعد عملية الإسترجاع. هل تريد استعادة تلك النسخة الإحتياطية؟ </string> <string name="import_database">استيراد نسخة احتياطية</string> <string name="invite_again">إعادة دعوته مجددا</string> <string name="inviteUser_Subject">قام بدعوتك عبر</string> diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 82102034b..d95793ddc 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -536,7 +536,6 @@ <string name="registration_password_too_weak">Неуспешна регистрация: Паролата е твърде слаба</string> <string name="choose_participants">Изберете участници</string> <string name="creating_conference">Създаване на групов чат...</string> - <string name="import_text">На устройството има резервно копие, което може да бъде възтанови.\nВашият Messenger ще бъде рестартиран по време на процеса на архивиране. Ще бъде ли възтановен архивът?</string> <string name="import_database">Възтановеване на резервно копие</string> <string name="invite_again">Покани отново</string> <string name="inviteUser_Subject">те покани чрез</string> diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 8adb55b81..5e4dab450 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -541,7 +541,6 @@ <string name="registration_password_too_weak">Error en el registre: La contrasenya és massa dèbil</string> <string name="choose_participants">Escolleix als participants</string> <string name="creating_conference">Crear xat de grup…</string> - <string name="import_text">Hi ha una còpia de seguretat en el teu dispositiu que no es pot importar.\nLa teva aplicació és reiniciarà durant el procès. Vols importar la còpia de seguretat?</string> <string name="import_database">Importar còpia de seguretat</string> <string name="invite_again">Convidar de nou</string> <string name="inviteUser_Subject">t\'ha convidat a través de</string> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 78ab63ffa..7ac17ca37 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -541,7 +541,6 @@ <string name="registration_password_too_weak">Registrierung fehlgeschlagen: Passwort zu schwach</string> <string name="choose_participants">Mitglieder auswählen</string> <string name="creating_conference">Gruppenchat wird erstellt…</string> - <string name="import_text">Es wurde ein Backup gefunden, welches importiert werden kann.\nDein Messenger startet während des Importvorgangs neu. Soll das Backup importiert werden?</string> <string name="import_database">Backup importieren</string> <string name="invite_again">Erneut hinzufügen</string> <string name="inviteUser_Subject">hat dich eingeladen über</string> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index fa2b7d624..848c98650 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -541,7 +541,6 @@ <string name="registration_password_too_weak">Error en el registro: La contraseña es demasiado débil</string> <string name="choose_participants">Elige a los participantes</string> <string name="creating_conference">Crear chat de grupo…</string> - <string name="import_text">Hay una copia de seguridad en tu dispositivo que se puede importar.\nTu aplicación se reiniciará durante el proceso. ¿Quieres importar la copia de seguridad?</string> <string name="import_database">Importar copia de seguridad</string> <string name="invite_again">Invitar de nuevo</string> <string name="inviteUser_Subject">te ha invitado a través de</string> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 28b48c938..3c07ed4e3 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -533,7 +533,6 @@ <string name="registration_password_too_weak">Échec de l’enregistrement : le mot de passe n’est pas assez fort</string> <string name="choose_participants">Choisir les participants</string> <string name="creating_conference">Création de la conférence …</string> - <string name="import_text">Votre appareil contient une sauvegarde que vous pouvez importer.\nVotre Messager sera redémarré une fois la sauvegarde restaurée. Désivrez-vous l’importer ? </string> <string name="import_database">Importer une sauvegarde</string> <string name="invite_again">Inviter à nouveau</string> <string name="inviteUser_Subject">vous a invité via</string> diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 0e16818a8..1dd209b61 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -541,7 +541,6 @@ <string name="registration_password_too_weak">Registrazione fallita: password troppo debole</string> <string name="choose_participants">Scegli i partecipanti</string> <string name="creating_conference">Creazione conversazione di gruppo…</string> - <string name="import_text">C\'è un backup sul tuo dispositivo che può essere importato.\nIl tuo Messenger sarà riavviato durante il processo di backup. Vorresti importare il backup? </string> <string name="import_database">Importa backup</string> <string name="invite_again">Invita di nuovo</string> <string name="inviteUser_Subject">ti ha invitato via</string> diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 623fd5904..dc311b9b1 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -521,7 +521,6 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze <string name="registration_password_too_weak">Rejestracja nie powiodła się: hasło zbyt słabe</string> <string name="choose_participants">Wybierz uczestnika</string> <string name="creating_conference">Utwórz czat grupowy…</string> - <string name="import_text">Znaleziono kopie zapasowa, którą można zaimportować. \nTwój messenger zostanie uruchomiony ponownie podczas procesu tworzenia kopii zapasowej. Czy kopia zapasowa ma zostać zaimportowana? </string> <string name="import_database">Importować backup</string> <string name="invite_again">Zaproś ponownie</string> <string name="inviteUser_Subject">zaprosił/a Cie poprzez</string> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 3439fc0ab..2f0fd737a 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -533,7 +533,6 @@ <string name="registration_password_too_weak">Ошибка регистрации: Пароль слишком простой</string> <string name="choose_participants">Выберите участников</string> <string name="creating_conference">Создание группового чата...</string> - <string name="import_text">На вашем устройстве найдена резервная копия, которая может быть импортирована.\n Ваш мессенджер будет перезапущен во время процесса восстановления. Импортировать данные из резервной копии? </string> <string name="import_database">Импортировать резервную копию</string> <string name="invite_again">Пригласить снова</string> <string name="inviteUser_Subject">приглашает вас присоединиться через</string> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 027279364..c04f926b5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -541,7 +541,7 @@ <string name="registration_password_too_weak">Registration failed: Password too weak</string> <string name="choose_participants">Choose participants</string> <string name="creating_conference">Creating group chat…</string> - <string name="import_text">There is a backup on your device which can be imported.\nYour Messenger will be restarted during backup process. Shall the backup be imported? </string> + <string name="import_text">If there is a backup available you can import this by pressing the button below.</string> <string name="import_database">Import backup</string> <string name="invite_again">Invite again</string> <string name="inviteUser_Subject">has invited you via</string> @@ -913,4 +913,5 @@ <string name="this_looks_like_a_domain">This looks like a domain address</string> <string name="add_anway">Add anyway</string> <string name="this_looks_like_channel">This looks like a channel address</string> + <string name="no_backup_available">No backup available</string> </resources> |