diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-08-08 22:04:57 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-08-09 22:34:03 +0200 |
| commit | bb4c255314e0beb1713050cc231f317894997f53 (patch) | |
| tree | 97a413d8b0db8759d8876ac2ee0ce9b56dff5f3e /src/main/res | |
| parent | 7dd493bff1ddfb0f12d95a6ed466f42973e09051 (diff) | |
reworked backup service
* automatically save database encrypted to local storage at 4 am each day
* run backup import in new thread
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/password.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 6 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/main/res/layout/password.xml b/src/main/res/layout/password.xml new file mode 100644 index 000000000..5de9baa23 --- /dev/null +++ b/src/main/res/layout/password.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" + android:hint="@string/account_settings_password" + android:id="@+id/password" /> +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index a25efe5f5..7820715bc 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -632,5 +632,11 @@ <string name="account_status_stream_error">Strem-Fehler</string> <string name="registration_password_too_weak">Registrierung fehlgeschlagen: Passwort zu schwach</string> <string name="this_device_is_no_longer_in_use">Dieses Gerät wird nicht länger verwendet</string> + <string name="Import_failed">Datenbankimport ist fehlgeschlagen und nicht möglich.</string> + <string name="Password_wrong">Falsches Passwort, erneut versuchen</string> + <string name="enter_account_password">Bitte gib das Passwort deines Profils ein, um das Backup zu importieren.</string> + <string name="import_canceled">Import abgebrochen</string> + <string name="databaseimport_started">Backup wird importiert, dies wird eine Weile dauern.</string> + <string name="please_wait">Bitte warten…</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 370b07224..309cdd285 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -677,4 +677,10 @@ <string name="type_tablet">Tablet</string> <string name="type_web">Web browser</string> <string name="type_console">Console</string> + <string name="import_canceled">Import canceled</string> + <string name="Import_failed">Database import failed, an import is not possible</string> + <string name="Password_wrong">Wrong password, try again</string> + <string name="enter_account_password">Please enter your account password to import your backup.</string> + <string name="please_wait">Please wait…</string> + <string name="databaseimport_started">Backup will be imported, this may take awhile.</string> </resources> |