mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 12:12:15 +02:00
Code

Hide Push-related options in folder settings

Browse Source
This commit is contained in:
cketti 2019-11-14 19:34:10 +01:00
parent 5b2edcf9fb
commit d67aa773e6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ui/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java
View File

@ -116,6 +116,7 @@ public class FolderSettings extends K9PreferenceActivity {
}
});
/* Temporarily disabled. See GH-4253
mPushClass = (ListPreference) findPreference(PREFERENCE_PUSH_CLASS);
mPushClass.setEnabled(isPushCapable);
mPushClass.setValue(mFolder.getRawPushClass().name());
@ -129,6 +130,7 @@ public class FolderSettings extends K9PreferenceActivity {
return false;
}
});
*/
mNotifyClass = (ListPreference) findPreference(PREFERENCE_NOTIFY_CLASS);
mNotifyClass.setValue(mFolder.getRawNotifyClass().name());
@ -152,7 +154,9 @@ public class FolderSettings extends K9PreferenceActivity {
FolderClass oldDisplayClass = mFolder.getDisplayClass();
mFolder.setDisplayClass(FolderClass.valueOf(mDisplayClass.getValue()));
mFolder.setSyncClass(FolderClass.valueOf(mSyncClass.getValue()));
/* Temporarily disabled. See GH-4253
mFolder.setPushClass(FolderClass.valueOf(mPushClass.getValue()));
*/
mFolder.setNotifyClass(FolderClass.valueOf(mNotifyClass.getValue()));
mFolder.save();

2
app/ui/src/main/res/xml/folder_settings_preferences.xml
View File

@ -50,6 +50,7 @@
android:entryValues="@array/folder_settings_folder_sync_mode_values"
android:dialogTitle="@string/folder_settings_folder_sync_mode_label" />
<!-- Temporarily disabled. See GH-4253
<ListPreference
android:persistent="false"
android:key="folder_settings_folder_push_mode"
@ -57,6 +58,7 @@
android:entries="@array/folder_settings_folder_push_mode_entries"
android:entryValues="@array/folder_settings_folder_push_mode_values"
android:dialogTitle="@string/folder_settings_folder_push_mode_label" />
-->
<ListPreference
android:persistent="false"