diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
index 9cdcd777ebb7..5af0033092a8 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -352,9 +352,10 @@ public void onBackPressed() {
private void setupSyncCategory(int titleColor) {
final PreferenceCategory preferenceCategorySync = (PreferenceCategory) findPreference("sync");
-
+ preferenceCategorySync.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_sync),
+ titleColor));
setupAutoUploadPreference(preferenceCategorySync, titleColor);
- setupInternalTwoWaySyncPreference(preferenceCategorySync, titleColor);
+ // setupInternalTwoWaySyncPreference(preferenceCategorySync, titleColor);
}
/**
@@ -401,7 +402,6 @@ private void setupDataPrivacyCategory(int titleColor) {
getResources().getString(R.string.privacy_policy));
intent.putExtra(ExternalSiteWebView.EXTRA_URL, privacyUrl.toString());
intent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
- intent.putExtra(ExternalSiteWebView.EXTRA_MENU_ITEM_ID, -1);
}
startActivity(intent);
@@ -428,7 +428,6 @@ private void setupDataPrivacyCategory(int titleColor) {
getResources().getString(R.string.prefs_open_source));
intent.putExtra(ExternalSiteWebView.EXTRA_URL, getResources().getString(R.string.sourcecode_url));
intent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
- intent.putExtra(ExternalSiteWebView.EXTRA_MENU_ITEM_ID, -1);
startActivity(intent);
return true;
});
@@ -648,7 +647,7 @@ private void setupAutoUploadPreference(PreferenceCategory preferenceCategoryMore
private void setupInternalTwoWaySyncPreference(PreferenceCategory preferenceCategorySync, int titleColor) {
Preference twoWaySync = findPreference("internal_two_way_sync");
- twoWaySync.setTitle(StringUtils.getColorSpan(getString(R.string.drawer_synced_folders),
+ twoWaySync.setTitle(StringUtils.getColorSpan(getString(R.string.internal_two_way_sync),
titleColor));
twoWaySync.setOnPreferenceClickListener(preference -> {
@@ -859,6 +858,7 @@ private void setUpServiceCategory(int titleColor) {
preferenceCategoryService.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_service),
titleColor));
setupHelpPreference(titleColor);
+ setupDeleteAccountPreference(titleColor);
setupImprintPreference(titleColor);
}
@@ -878,6 +878,22 @@ private void setupHelpPreference(int titleColor) {
}
}
+ private void setupDeleteAccountPreference(int titleColor) {
+ Preference pHelp = findPreference("delete_account");
+ if (pHelp != null) {
+ pHelp.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_delete_account),
+ titleColor));
+ pHelp.setOnPreferenceClickListener(preference -> {
+ String helpWeb = getString(R.string.url_delete_account);
+ if (!helpWeb.isEmpty()) {
+ openLinkInWebView(helpWeb, R.string.prefs_delete_account);
+ }
+ return true;
+ });
+
+ }
+ }
+
private void setupImprintPreference(int titleColor) {
Preference pImprint = findPreference("imprint");
if (pImprint != null) {
@@ -901,7 +917,6 @@ private void openLinkInWebView(String url, @StringRes int title) {
getResources().getString(title));
externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_URL, url);
externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
- externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_MENU_ITEM_ID, -1);
startActivity(externalWebViewIntent);
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2e0fd925884a..f5186e13e29e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -991,6 +991,7 @@
Datenschutz
Datenschutz
Datenschutzbestimmungen
+ Konto endgültig löschen
Verwendete OpenSource Software
Info
Bedienung
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 45a8ce43602c..17c8d7a73811 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -91,6 +91,7 @@
"https://play.google.com/store/apps/details?id=com.nextcloud.client"
https://nextcloud.com/install
+ https://www.telekom.de/hilfe/vertrag-rechnung/login-daten-passwoerter/telekom-login-loeschen
https://www.telekom.de/impressum
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4079efc10ab..5b1d319433cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1197,6 +1197,7 @@
Data Privacy
Privacy Settings
Privacy Policy
+ Delete account permanently
Used OpenSource Software
Service
Generating PDF…
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b36934671ee5..3d4a7da800f4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -86,11 +86,11 @@
android:layout="@layout/custom_preference_layout"
android:summary="@string/prefs_sycned_folders_summary" />
-
+ android:summary="@string/prefs_two_way_sync_summary" />-->
+