diff --git a/.gitmodules b/.gitmodules index f8fb9ee725f5..36ce443c8aeb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = user_manual/ocdoc url = https://github.com/nextcloud/documentation branch = master +[submodule "nextcloud-android-library"] + path = nextcloud-android-library + url = https://github.com/Grmume/android-library-1 diff --git a/build.gradle b/build.gradle index 2cc82645145b..4b8329d8a49f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta7' + classpath 'com.android.tools.build:gradle:3.1.0-alpha06' classpath 'com.google.gms:google-services:3.0.0' } } @@ -184,7 +184,8 @@ dependencies { /// dependencies for app building implementation name: 'touch-image-view' implementation 'com.android.support:multidex:1.0.2' - compile 'com.github.nextcloud:android-library:1.0.31' + ///compile 'com.github.nextcloud:android-library-1:1.0.31' + compile project(':nextcloud-android-library') implementation "com.android.support:support-v4:${supportLibraryVersion}" implementation "com.android.support:design:${supportLibraryVersion}" implementation 'com.jakewharton:disklrucache:2.0.2' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45b63bc7e56f..922775cabd80 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-rc-3-all.zip diff --git a/nextcloud-android-library b/nextcloud-android-library new file mode 160000 index 000000000000..67b93fb234f5 --- /dev/null +++ b/nextcloud-android-library @@ -0,0 +1 @@ +Subproject commit 67b93fb234f5755684c83cb0e787a464af431ae1 diff --git a/settings.gradle b/settings.gradle index 6a2e4c284a20..042d80bbd81a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ -include ':' \ No newline at end of file +include ':nextcloud-android-library' +include ':' diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index a3d9c6af7f61..761c347a229e 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -56,6 +56,7 @@ + diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java index 7fb6da691099..b14f70243632 100644 --- a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -51,6 +51,7 @@ import android.content.pm.ActivityInfo; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.net.Network; import android.net.Uri; import android.net.http.SslError; import android.os.Build; @@ -86,6 +87,7 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.ImageButton; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; @@ -223,6 +225,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private TextView mOAuthTokenEndpointText; private EditText mUsernameInput; private EditText mPasswordInput; + + /// Authentication advanced elements + private LinearLayout mAdvancedSettingsLayout; + private CheckBox mShowAdvancedSettingsCheckbox; + private EditText mWifiSsidInput; + private EditText mLocalUrlInput; + private View mOkButton; private TextView mAuthStatusView; private ImageButton mTestServerButton; @@ -563,6 +572,11 @@ private void initOverallUi() { mServerStatusView = (TextView) findViewById(R.id.server_status_text); mTestServerButton = (ImageButton) findViewById(R.id.testServerButton); + mAdvancedSettingsLayout = (LinearLayout) findViewById(R.id.advanced_settings_layout); + mShowAdvancedSettingsCheckbox = (CheckBox) findViewById(R.id.advanced_settings_check); + mWifiSsidInput = (EditText) findViewById(R.id.wifi_ssid); + mLocalUrlInput = (EditText) findViewById(R.id.local_ip); + mOkButton = findViewById(R.id.buttonOK); mOkButton.setOnClickListener(v -> onOkClick()); @@ -1072,13 +1086,23 @@ private void onUrlInputFocusLost() { private void checkOcServer() { - String uri; + String uri = null; if (mHostUrlInput != null) { uri = mHostUrlInput.getText().toString().trim(); + } + + if(mShowAdvancedSettingsCheckbox.isChecked()) { + if(NetworkUtils.currentlyConnectedToSsid(mWifiSsidInput.getText().toString(),getApplicationContext())) { + uri = mLocalUrlInput.getText().toString().trim(); + } + } + + if(uri == null) { + uri = mServerInfo.mBaseUrl; + } + else { mOkButton.setEnabled(false); showRefreshButton(false); - } else { - uri = mServerInfo.mBaseUrl; } mServerIsValid = false; @@ -1200,19 +1224,25 @@ public void onOkClick() { mServerStatusText = R.string.auth_wtf_reenter_URL; showServerStatus(); mOkButton.setEnabled(false); + Log_OC.d(TAG, "OnOkClick: Check failed!"); return; } - - if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType)) { - startOauthorization(); - } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()) - .equals(mAuthTokenType)) { - - startSamlBasedFederatedSingleSignOnAuthorization(); + Log_OC.d(TAG, "OnOkClick: Check succeded!"); + if(webViewLoginMethod) { + showWebViewLogin(); } else { - checkBasicAuthorization(null, null); + if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType)) { + startOauthorization(); + } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()) + .equals(mAuthTokenType)) { + + startSamlBasedFederatedSingleSignOnAuthorization(); + } else { + checkBasicAuthorization(null, null); + } } + } @@ -1386,16 +1416,24 @@ private void onGetServerInfoFinish(RemoteOperationResult result) { mWaitingForOpId = Long.MAX_VALUE; // update server status, but don't show it yet - if (!webViewLoginMethod) { - updateServerStatusIconAndText(result); - } +// if (!webViewLoginMethod) { +// updateServerStatusIconAndText(result); +// showServerStatus(); +// } + + updateServerStatusIconAndText(result); + showServerStatus(); if (result.isSuccess()) { /// SUCCESS means: // 1. connection succeeded, and we know if it's SSL or not // 2. server is installed // 3. we got the server version - // 4. we got the authentication method required by the server + // 4. we got the authentication method required by the server + + // Enable the connect button + mOkButton.setEnabled(true); + mServerInfo = (GetServerInfoOperation.ServerInfo) (result.getData().get(0)); webViewLoginMethod = mServerInfo.mVersion.isWebLoginSupported() && !forceOldLoginMethod; @@ -1405,13 +1443,10 @@ private void onGetServerInfoFinish(RemoteOperationResult result) { checkBasicAuthorization(webViewUser, webViewPassword); } else if (webViewLoginMethod) { // hide old login - mOkButton.setVisibility(View.GONE); + mOkButton.setVisibility(View.VISIBLE); + mUsernameInputLayout.setVisibility(View.GONE); mPasswordInputLayout.setVisibility(View.GONE); - - setContentView(R.layout.account_setup_webview); - mLoginWebView = (WebView) findViewById(R.id.login_webview); - initWebViewLogin(mServerInfo.mBaseUrl); } else { // show old login mOkButton.setVisibility(View.VISIBLE); @@ -1428,6 +1463,7 @@ private void onGetServerInfoFinish(RemoteOperationResult result) { mServerIsValid = false; } else { + mServerIsValid = true; } @@ -1444,7 +1480,7 @@ private void onGetServerInfoFinish(RemoteOperationResult result) { if (!mServerIsValid) { // hide old login - mOkButton.setVisibility(View.GONE); + //mOkButton.setVisibility(View.GONE); // Do not hide connect button mUsernameInputLayout.setVisibility(View.GONE); mPasswordInputLayout.setVisibility(View.GONE); } @@ -1456,6 +1492,21 @@ private void onGetServerInfoFinish(RemoteOperationResult result) { } } + private void showWebViewLogin() { + + // hide old login + mOkButton.setVisibility(View.GONE); + mUsernameInputLayout.setVisibility(View.GONE); + mPasswordInputLayout.setVisibility(View.GONE); + mAdvancedSettingsLayout.setVisibility(View.GONE); + + Log_OC.d(TAG, "showing webview with address "+mServerInfo.mBaseUrl); + + setContentView(R.layout.account_setup_webview); + mLoginWebView = (WebView) findViewById(R.id.login_webview); + initWebViewLogin(mServerInfo.mBaseUrl); + } + private boolean authSupported(AuthenticationMethod authMethod) { return ((BASIC_TOKEN_TYPE.equals(mAuthTokenType) && @@ -1953,6 +2004,36 @@ private boolean createAccount(RemoteOperationResult authResult) { Integer.toString(AccountUtils.ACCOUNT_VERSION) ); + // include wifi ssid and local network url of server in account + mAccountMgr.setUserData( + mAccount, + Constants.KEY_OC_LOCAL_WIFI_SSID, + mLocalUrlInput.getText().toString().trim() + ); + + mAccountMgr.setUserData( + mAccount, + Constants.KEY_OC_LOCAL_BASE_URL, + mWifiSsidInput.getText().toString() + ); + + mAccountMgr.setUserData( + mAccount, + Constants.KEY_OC_USE_LOCAL_BASE_URL, + String.valueOf(mShowAdvancedSettingsCheckbox.isChecked()) + ); + + + + String localAccountName = com.owncloud.android.lib.common.accounts.AccountUtils. + buildAccountName(uri, username); + + mAccountMgr.setUserData( + mAccount, + "localAccountName", + localAccountName + ); + /// add the new account as default in preferences, if there is none already Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this); if (defaultAccount == null) { @@ -2100,6 +2181,23 @@ public void onCheckClick(View view) { updateAuthenticationPreFragmentVisibility(); } + /** + * Called when the checkbox for show advanced settings is clicked. + * + * @param view 'View password' 'button' + */ + public void onShowAdvancedSettingsClick(View view) { + if(mShowAdvancedSettingsCheckbox.isChecked()) { + if(NetworkUtils.isConnectedToWifi(getApplicationContext())) + { + mWifiSsidInput.setText(NetworkUtils.getCurrentWifiSsid(getApplicationContext())); + } + mAdvancedSettingsLayout.setVisibility(View.VISIBLE); + }else { + mAdvancedSettingsLayout.setVisibility(View.GONE); + } + } + /** * Called when the 'action' button in an IME is pressed ('enter' in software keyboard). diff --git a/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java b/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java index 4ba9038d7fb4..eac143079a6a 100644 --- a/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java +++ b/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java @@ -35,6 +35,7 @@ public class SyncedFolder implements Serializable, Cloneable { private Boolean wifiOnly; private Boolean chargingOnly; private Boolean subfolderByDate; + private String subfolderPattern; private String account; private Integer uploadAction; private boolean enabled; @@ -90,6 +91,7 @@ public SyncedFolder(String localPath, String remotePath, Boolean wifiOnly, Boole this.wifiOnly = wifiOnly; this.chargingOnly = chargingOnly; this.subfolderByDate = subfolderByDate; + this.subfolderPattern = this.account = account; this.uploadAction = uploadAction; this.enabled = enabled; @@ -147,6 +149,9 @@ public void setChargingOnly(Boolean chargingOnly) { public Boolean getSubfolderByDate() { return subfolderByDate; } + public String getSubfolderByDate() { + return subfolderPattern; + } public void setSubfolderByDate(Boolean subfolderByDate) { this.subfolderByDate = subfolderByDate; diff --git a/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java b/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java index d03922b76921..c31f51d9000d 100644 --- a/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java +++ b/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java @@ -38,6 +38,7 @@ public class SyncedFolderParcelable implements Parcelable { private Boolean mChargingOnly = false; private Boolean mEnabled = false; private Boolean mSubfolderByDate = false; + private String mSubfolderPattern; private Integer mUploadAction; private MediaFolderType mType; private long mId; diff --git a/src/main/res/layout-land/account_setup.xml b/src/main/res/layout-land/account_setup.xml index 224556826651..32a84c3dfd95 100644 --- a/src/main/res/layout-land/account_setup.xml +++ b/src/main/res/layout-land/account_setup.xml @@ -80,34 +80,34 @@ android:layout_marginBottom="@dimen/alternate_margin" android:textColor="@color/login_text_color" android:contentDescription="@string/auth_expired_basic_auth_toast"/> - - - - - - - - - + + + + + + + + + android:tint="@color/white" /> + android:contentDescription="@string/auth_refresh_button" + android:padding="@dimen/zero" + android:scaleType="fitCenter" + android:src="@drawable/ic_action_refresh" + android:visibility="gone" /> - + + + + + + + + + + + + + + + + + + + - + - - + + + - + - + + + + + + + + + + + + + + + + @@ -249,20 +304,20 @@ android:textColor="@color/login_text_color" android:contentDescription="@string/auth_unauthorized"/> - + - @@ -278,8 +333,8 @@ android:text="@string/auth_register" android:textColor="@color/login_text_hint_color" android:contentDescription="@string/auth_register"/> - - + + diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 0598c5b3340f..0a98c2cf7d33 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -406,4 +406,5 @@ العودة الحصول على الشفرة المصدرية الرخصة - + Enable advanced settings + diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml index c4451d82ec91..24fb3bfcd239 100644 --- a/src/main/res/values-ast/strings.xml +++ b/src/main/res/values-ast/strings.xml @@ -500,4 +500,5 @@ Recibióse un avisu nuevu Zarrar sesión - + Enable advanced settings + diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 3606e40237ed..4563c0bbf425 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -441,5 +441,6 @@ Получено е ново известие Отпиши се Файлът не е открит + Enable advanced settings - + diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index a807c084f1ca..f26e43cf60c8 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -511,5 +511,6 @@ Mantingueu les vostres fotos segures Omet + Enable advanced settings - + diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml index 0dce1b709489..cfbc3a0c8404 100644 --- a/src/main/res/values-cs-rCZ/strings.xml +++ b/src/main/res/values-cs-rCZ/strings.xml @@ -693,4 +693,5 @@ Push oznámení zakázáno kvůli závislostem na proprietárních službách Google Play. Žádné push oznámení kvůli zastaralé relaci přihlášení. Zvažte opětovné přidání účtu. Push oznámení není momentálně k dispozici. + Enable advanced settings diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 61dd2d511ee8..f0f2c1cb98a9 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -463,4 +463,5 @@ TILBAGE Licens - + Enable advanced settings + diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index 74633e4a254d..c83123c5ac72 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -693,4 +693,5 @@ Push Benachrichtigungen deaktiviert aufgrund der Abhängigkeiten zu proprietären Google Play Diensten. Keine Push Benachrichtigungen aufgrund veralteter Benutzersitzung. Bitte erwägen Sie das erneute Hinzufügen Ihres Kontos. Push Benachrichtigungen aktuell nicht verfügbar. + Enable advanced settings diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 1fb306adecbc..56677071dce3 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -64,6 +64,9 @@ Server-Adresse https://… Benutzername Passwort + Erweiterte Einstellungen + WLan-SSID + Lokale Adresse Du hast noch keinen Server?\nKlicke hier um Server-Anbieter zu finden Dateien Verbinden @@ -694,4 +697,5 @@ Push Benachrichtigungen deaktiviert aufgrund der Abhängigkeiten zu proprietären Google Play Diensten. Keine Push Benachrichtigungen aufgrund veralteter Benutzersitzung. Bitte erwäge das erneute Hinzufügen deines Kontos. Push Benachrichtigungen aktuell nicht verfügbar. + Enable advanced settings diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 1f90d16c0d93..0a5554707926 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -692,4 +692,5 @@ Οι ειδοποιήσεις απενεργοποιήθηκαν λόγω εξαρτήσεων στις ιδιόκτητες υπηρεσίες Google Play. Δεν υπάρχουν ειδοποιήσεις λόγω παρωχημένης συνεδρίας σύνδεσης. Παρακαλούμε επανεξετάσετε το ενδεχόμενο να ξανά προσθέσετε τον λογαριασμό σας. Οι ειδοποιήσεις push δεν είναι διαθέσιμες αυτήν τη στιγμή. + Enable advanced settings diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml index 656b33db6c17..27f1f440738b 100644 --- a/src/main/res/values-en-rGB/strings.xml +++ b/src/main/res/values-en-rGB/strings.xml @@ -64,6 +64,9 @@ Server address https://… Username Password + Advanced Settings + WiFi-SSID + Local Address Do you not have a server yet?\nClick here to get one from a provider Files Connect @@ -692,4 +695,5 @@ Push notifications disabled due to dependencies on proprietary Google Play services. No push notifications due to outdated login session. Please consider re-adding your account. Push notifications currently not available. + Enable advanced settings diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml index 09e0cdd4d70e..96ddbeb980a2 100644 --- a/src/main/res/values-es-rAR/strings.xml +++ b/src/main/res/values-es-rAR/strings.xml @@ -661,4 +661,5 @@ Testear conexión con el servidor No se permite volver a compartir - + Enable advanced settings + diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml index a85e632acd9a..ec79d1c6e8ec 100644 --- a/src/main/res/values-es-rMX/strings.xml +++ b/src/main/res/values-es-rMX/strings.xml @@ -692,4 +692,5 @@ Las notificaciones push están deshabilitadas debido a dependencias de servicios propietarios de Google Play. No hay notificaciones push debido a un incio de sesión caduco. Por favor vuelve a ingresar a tu cuenta. En este momento las notificaciones push no están disponibles. + Enable advanced settings diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 63cf16620f3a..bc7ad6e7b20f 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -692,4 +692,5 @@ Notificaciones push deshabilitadas debido a que depende de servicios propietarios de Google Play. No hay notificaciones push debido a que la sesión está caducada. Por favor, considera volver a añadir la cuentea. Notificaciones push actualmente no disponibles. + Enable advanced settings diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 679ed9029ff0..2f877e651570 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -394,5 +394,6 @@ Mesedez, baimendu berriz ezabatu Lehenetsia Ezezaguna + Enable advanced settings - + diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 62366b492f40..2e133cffb36d 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -401,4 +401,5 @@ هیچ وقت هیچ فایلی یافت نشد حریم خصوصی - + Enable advanced settings + diff --git a/src/main/res/values-fi-rFI/strings.xml b/src/main/res/values-fi-rFI/strings.xml index 9556ccce536d..76d7b9e405b4 100644 --- a/src/main/res/values-fi-rFI/strings.xml +++ b/src/main/res/values-fi-rFI/strings.xml @@ -529,4 +529,5 @@ Käytä sormenjälkeäsi sovelluksen lukituksen avaamiseen Hanki lähdekoodi Lisenssi - + Enable advanced settings + diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 6aff7f70ce81..a9fccb25dc7d 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -692,4 +692,5 @@ L\'envoi de notifications est désactivé à cause des dépendances propriétaires des services Google Play. Aucune notification push à cause d\'une connexion expirée. Veuillez ajouter de nouveau votre compte. Les notifications push ne sont pas disponibles actuellement. + Enable advanced settings diff --git a/src/main/res/values-he/strings.xml b/src/main/res/values-he/strings.xml index 2188d059656f..5d7b59ca3d29 100644 --- a/src/main/res/values-he/strings.xml +++ b/src/main/res/values-he/strings.xml @@ -373,5 +373,6 @@ חשבונות מרובים דלג + Enable advanced settings - + diff --git a/src/main/res/values-hu-rHU/strings.xml b/src/main/res/values-hu-rHU/strings.xml index f350aade02c9..17a28e0b1ab9 100644 --- a/src/main/res/values-hu-rHU/strings.xml +++ b/src/main/res/values-hu-rHU/strings.xml @@ -513,4 +513,5 @@ soha Kijelentkezés Titoktartás - + Enable advanced settings + diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index fd2e3eebf155..d44b9818e54f 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -676,5 +676,6 @@ Gunakan sidik jadi untuk membuka aplikasi. KEMBALI Kembali ke metode login lama. + Enable advanced settings - + diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml index a51ace054396..328853205b8f 100644 --- a/src/main/res/values-is/strings.xml +++ b/src/main/res/values-is/strings.xml @@ -688,4 +688,5 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Sæki skrár… Notkunarleyfi - + Enable advanced settings + diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 3b5481738490..1095b7c21e06 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -692,4 +692,5 @@ Notifiche push disabilitate a causa delle dipendenze dai servizi proprietari di Google Play. Nessuna notifica push a causa della sessione di accesso scaduta. Considera di aggungere nuovamente il tuo account. Notifiche push attualmente non disponibili. + Enable advanced settings diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml index d8c8ed1800d3..d7e5ab352438 100644 --- a/src/main/res/values-ja-rJP/strings.xml +++ b/src/main/res/values-ja-rJP/strings.xml @@ -493,4 +493,5 @@ 新しい通知を受け取りました - + Enable advanced settings + diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index ba8bb335a126..3d58ca942344 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -538,5 +538,6 @@ 파일 업로드 중… 파일 다운로드 중… + Enable advanced settings - + diff --git a/src/main/res/values-large-land/strings.xml b/src/main/res/values-large-land/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-large-land/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-lt-rLT/strings.xml b/src/main/res/values-lt-rLT/strings.xml index a7f2dc36f712..2ee7564bd000 100644 --- a/src/main/res/values-lt-rLT/strings.xml +++ b/src/main/res/values-lt-rLT/strings.xml @@ -695,4 +695,5 @@ Stumti pranešimus, kurie išjungti dėl ryšių su Google Play servisais Nėra pranešimų dėl pasenusios prisijungimo sesijos. Pasvarstykite galimybę iš naujo pridėti prisijungimo duomenis. Stumti pranešimus funkcija šiuo metu negalima + Enable advanced settings diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml index f93f86a187cc..6ef21825f2aa 100644 --- a/src/main/res/values-lv/strings.xml +++ b/src/main/res/values-lv/strings.xml @@ -382,5 +382,6 @@ Glabājiet savus fotoattēlus drošībā Izlaist + Enable advanced settings - + diff --git a/src/main/res/values-mn/strings.xml b/src/main/res/values-mn/strings.xml index f24195f3db0f..6e3a49c9bacf 100644 --- a/src/main/res/values-mn/strings.xml +++ b/src/main/res/values-mn/strings.xml @@ -339,5 +339,6 @@ Файлуудыг илгээж байна … Файлуудыг татаж байна … + Enable advanced settings - + diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 27f0dae7c17e..115344081405 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -692,4 +692,5 @@ Push-merknader er avskrudd på grunn av avhengigheter til proprietære Google Play-tjenester. Ingen push-merknader på grunn av utdatert innloggingsøkt. Overvei å legge til kontoen din på nytt. Push-merknader er for tiden ikke tilgjengelige. + Enable advanced settings diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index ab866a67fdea..9e9699c3b5c9 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -693,4 +693,5 @@ Kies er eentje van een provider. Push notificaties uitgeschakeld door afhankelijkheden op eigen Google Play-services. Geen push-notificaties als gevolg van de verouderde inlogsessie. Overweeg het opnieuw toevoegen van uw account. Push notificaties momenteel niet beschikbaar. + Enable advanced settings diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index f3fde64db979..c5ab3dfb56cc 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -694,4 +694,5 @@ Powiadomienia typu push zostały wyłączone ze względu na zastrzeżenia prawne usług Google Play. Brak powiadomień typu push ze względu na wygasłą sesję logowania. Przemyśl ponowne dodanie swojego konta. Powiadomienia typu push nie są aktualnie dostępne. + Enable advanced settings diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 8d300c05bf86..5d6ff6282e5e 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -692,4 +692,5 @@ Envio de notificações desabilitadas devido à dependências nos serviços proprietários do Google Play. Sem envio de notificações devido à sessão de login desatualizada. Considere readicionar sua conta. Atualmente o envio de notificações está indisponível. + Enable advanced settings diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index d2f957312113..d6313f5ccedf 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -349,5 +349,6 @@ Ligar-se a todas as suas contas cloud Passar à frente + Enable advanced settings - + diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index 6b47bbf70767..0416e370f238 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -403,5 +403,6 @@ Păstrează-ți fotografiile în siguranță Sari peste + Enable advanced settings - + diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index dd5f4342c373..679040bbbb06 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -695,4 +695,5 @@ Всплывающие уведомления отключены, так как зависят от Google Play сервисов Нет аккаунтов для уведомлений. Пожалуйста добавьте аккаунт. Всплывающие уведомления недоступны + Enable advanced settings diff --git a/src/main/res/values-sk-rSK/strings.xml b/src/main/res/values-sk-rSK/strings.xml index f22381f19e90..4d28a530cba8 100644 --- a/src/main/res/values-sk-rSK/strings.xml +++ b/src/main/res/values-sk-rSK/strings.xml @@ -440,4 +440,5 @@ Twitter Informácie o používateľovi - + Enable advanced settings + diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index a2804d0f2150..89ebe14535c1 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -639,4 +639,5 @@ Nastavi mape Preizkusi povezavo s strežnikom - + Enable advanced settings + diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml index 0ce4e9ffdd4c..1ba5a222e195 100644 --- a/src/main/res/values-sq/strings.xml +++ b/src/main/res/values-sq/strings.xml @@ -689,4 +689,5 @@ Merr kodin burimor Liçensë - + Enable advanced settings + diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index ec91e33a3590..907f0ae5dd06 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -693,4 +693,5 @@ Брза обавештења искључена јер зависе од власничког Google Play сервиса. Нема брзих обавештења зато што вам је сесија застарела. Избришите и додајте поново налог. Брза обавештења тренутно нису доступна. + Enable advanced settings diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 5ebb48988892..4d5f188f6e28 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -692,4 +692,5 @@ Pushnotiser har inaktiverats på grund av beroenden till skyddade Google Play-tjänster Inga pushnotiser på grund av utgången inloggningssession. Överväg att lägga till ditt konto på nytt. Push-notiser är inte tillgängligt för tillfället. + Enable advanced settings diff --git a/src/main/res/values-sw360dp/strings.xml b/src/main/res/values-sw360dp/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-sw360dp/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-sw600dp/strings.xml b/src/main/res/values-sw600dp/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-sw600dp/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 2deb090f8a7a..e3c5d97ef646 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -692,4 +692,5 @@ Anında bildirimler Google Play hizmetlerine ait olan bağımlılıklar nedeniyle devre dışı bırakıldı. Oturumunuzun süresi dolduğundan anında bildirimler gönderilemez. Lütfen hesabınızı yeniden eklemeyi düşünün. Anında bildirimler şu anda kullanılamıyor. + Enable advanced settings diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index be6b9bb60979..f40504d8f5f8 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -337,5 +337,6 @@ Тримайте свої фото у безпеці Пропустити + Enable advanced settings - + diff --git a/src/main/res/values-v11/strings.xml b/src/main/res/values-v11/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-v11/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-v19/strings.xml b/src/main/res/values-v19/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-v19/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-v21/strings.xml b/src/main/res/values-v21/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-v21/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-v9/strings.xml b/src/main/res/values-v9/strings.xml new file mode 100644 index 000000000000..4afb96ab85ad --- /dev/null +++ b/src/main/res/values-v9/strings.xml @@ -0,0 +1,4 @@ + + + Enable advanced settings + \ No newline at end of file diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index e588c6235608..24429b6b83c2 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -690,4 +690,5 @@ 由于依赖于专有的Google Play服务,推送通知被禁用。 由于过期的登录会话,没有推送通知。 请考虑重新添加您的帐户。 推送通知目前不可用。 + Enable advanced settings diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 152f39b04182..39eb7e9a39ad 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -543,4 +543,5 @@ 立刻備份 登出 測試伺服器連線 - + Enable advanced settings + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a690008af9cb..5c31344f6208 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -710,4 +710,5 @@ Push notifications disabled due to dependencies on proprietary Google Play services. No push notifications due to outdated login session. Please consider re-adding your account. Push notifications currently not available. + Show advanced settings

AltStyle によって変換されたページ (->オリジナル) /