forked from upstream-mirrors/OpenTracks
sync from main
This commit is contained in:
@@ -17,8 +17,9 @@ package com.google.android.apps.mytracks;
|
||||
|
||||
import static com.google.android.apps.mytracks.Constants.TAG;
|
||||
|
||||
import com.google.android.apps.mytracks.io.backup.BackupActivityHelper;
|
||||
import com.google.android.apps.mytracks.io.backup.BackupActivity;
|
||||
import com.google.android.apps.mytracks.io.backup.BackupPreferencesListener;
|
||||
import com.google.android.apps.mytracks.io.backup.RestoreChooserActivity;
|
||||
import com.google.android.apps.mytracks.services.sensors.ant.AntUtils;
|
||||
import com.google.android.apps.mytracks.util.ApiAdapterFactory;
|
||||
import com.google.android.apps.mytracks.util.BluetoothDeviceUtils;
|
||||
@@ -62,8 +63,9 @@ import java.util.Set;
|
||||
*/
|
||||
public class SettingsActivity extends PreferenceActivity {
|
||||
|
||||
private static final int DIALOG_CONFIRM_RESET = 0;
|
||||
private static final int DIALOG_CONFIRM_ACCESS = 1;
|
||||
private static final int DIALOG_CONFIRM_RESET_ID = 0;
|
||||
private static final int DIALOG_CONFIRM_ACCESS_ID = 1;
|
||||
private static final int DIALOG_CONFIRM_RESTORE_ID = 2;
|
||||
|
||||
// Value when the task frequency is off.
|
||||
private static final String TASK_FREQUENCY_OFF = "0";
|
||||
@@ -150,7 +152,7 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
resetPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
||||
@Override
|
||||
public boolean onPreferenceClick(Preference arg0) {
|
||||
showDialog(DIALOG_CONFIRM_RESET);
|
||||
showDialog(DIALOG_CONFIRM_RESET_ID);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
@@ -162,7 +164,7 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
if ((Boolean) newValue) {
|
||||
showDialog(DIALOG_CONFIRM_ACCESS);
|
||||
showDialog(DIALOG_CONFIRM_ACCESS_ID);
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
@@ -174,7 +176,7 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
@Override
|
||||
protected Dialog onCreateDialog(int id) {
|
||||
switch (id) {
|
||||
case DIALOG_CONFIRM_RESET:
|
||||
case DIALOG_CONFIRM_RESET_ID:
|
||||
return DialogUtils.createConfirmationDialog(
|
||||
this, R.string.settings_reset_confirm_message, new OnClickListener() {
|
||||
@Override
|
||||
@@ -182,7 +184,7 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
onResetPreferencesConfirmed();
|
||||
}
|
||||
});
|
||||
case DIALOG_CONFIRM_ACCESS:
|
||||
case DIALOG_CONFIRM_ACCESS_ID:
|
||||
return DialogUtils.createConfirmationDialog(
|
||||
this, R.string.settings_sharing_allow_access_confirm_message, new OnClickListener() {
|
||||
@Override
|
||||
@@ -192,6 +194,14 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
pref.setChecked(true);
|
||||
}
|
||||
});
|
||||
case DIALOG_CONFIRM_RESTORE_ID:
|
||||
return DialogUtils.createConfirmationDialog(
|
||||
this, R.string.settings_backup_restore_confirm_message, new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
startActivity(new Intent(SettingsActivity.this, RestoreChooserActivity.class));
|
||||
}
|
||||
});
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
@@ -354,9 +364,7 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
new OnPreferenceClickListener() {
|
||||
@Override
|
||||
public boolean onPreferenceClick(Preference preference) {
|
||||
BackupActivityHelper backupHelper =
|
||||
new BackupActivityHelper(SettingsActivity.this);
|
||||
backupHelper.writeBackup();
|
||||
startActivity(new Intent(SettingsActivity.this, BackupActivity.class));
|
||||
return true;
|
||||
}
|
||||
});
|
||||
@@ -364,9 +372,7 @@ public class SettingsActivity extends PreferenceActivity {
|
||||
new OnPreferenceClickListener() {
|
||||
@Override
|
||||
public boolean onPreferenceClick(Preference preference) {
|
||||
BackupActivityHelper backupHelper =
|
||||
new BackupActivityHelper(SettingsActivity.this);
|
||||
backupHelper.restoreBackup();
|
||||
showDialog(DIALOG_CONFIRM_RESTORE_ID);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user