simplify background-mode options

This commit is contained in:
B. Petersen
2018-05-20 23:59:01 +02:00
parent fbbf1a5f3e
commit 51d80e4b25
2 changed files with 10 additions and 20 deletions
@@ -167,8 +167,6 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen
NotificationCenter.getInstance().removeObserver(this, NotificationCenter.imexFileWritten);
}
int mSelection;
@Override
public View createView(Context context)
{
@@ -403,30 +401,25 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen
showDialog(builder.create());
}
else if( i == backgroupModeRow ) {
mSelection = ApplicationLoader.getPermanentPush()? 1 : 0;
int selection = ApplicationLoader.getPermanentPush()? 1 : 0;
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
builder.setTitle(R.string.BackgroundModeExplain);
builder.setTitle(R.string.BackgroundMode);
builder.setSingleChoiceItems(new CharSequence[]{
ApplicationLoader.applicationContext.getString(R.string.BackgroundModeSaveBatteryExplain),
ApplicationLoader.applicationContext.getString(R.string.BackgroundModeFastFetchExplain),
ApplicationLoader.applicationContext.getString(R.string.BackgroundModeSaveBattery),
ApplicationLoader.applicationContext.getString(R.string.BackgroundModeFastFetch),
},
mSelection,
selection,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mSelection = which;
}
});
builder.setNegativeButton(R.string.Cancel, null);
builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
ApplicationLoader.setPermanentPush(mSelection==1);
public void onClick(DialogInterface dialog, int selection) {
ApplicationLoader.setPermanentPush(selection==1);
if (listView != null) {
listView.invalidateViews();
}
dialog.dismiss();
}
});
builder.setNegativeButton(R.string.Cancel, null);
showDialog(builder.create());
}
else if (i == passcodeRow) {
@@ -467,9 +467,6 @@
<string name="QrJoinVerifiedGroupTitle">QR invite code</string>
<string name="QrJoinVerifiedGroupHint">Scan this to join the verified group <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.</string>
<string name="BackgroundMode">Background mode</string>
<string name="BackgroundModeExplain">Background fetch mode (foreground is always instant)</string>
<string name="BackgroundModeSaveBattery">Save battery</string>
<string name="BackgroundModeSaveBatteryExplain">Save battery - fetch about once per minute, recommended</string>
<string name="BackgroundModeFastFetch">Instant</string>
<string name="BackgroundModeFastFetchExplain">Try instant fetch - needs more battery</string>
<string name="BackgroundModeFastFetch">Fast fetch</string>
</resources>