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 c2290eb1c462..df4c1c6b8c87 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 @@ -343,9 +343,10 @@ private void setupAboutCategory(String appVersion) { 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); } /** @@ -639,7 +640,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 -> { @@ -850,6 +851,7 @@ private void setUpServiceCategory(int titleColor) { preferenceCategoryService.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_category_service), titleColor)); setupHelpPreference(titleColor); + setupDeleteAccountPreference(titleColor); setupImprintPreference(titleColor); } @@ -869,6 +871,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) { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 18e006a1ea9c..bfbe31c3760c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -975,6 +975,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 15b9e9282844..1e3291334711 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 a1fbc337326f..610c82385987 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1189,6 +1189,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" />--> +