karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Update "Allow access" texts and variables

Browse Source 
Change notification permission to dangerous
Sort entries in keys.xml alphabetically
This commit is contained in:
Jimmy Shih
2011-10-10 12:10:12 -07:00
parent 9156735aa0
commit da7bd0f4ea
7 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+7 -7
View File
@@ -143,21 +143,21 @@ public class SettingsActivity extends PreferenceActivity {
}
});
// Add a confirmation dialog for the share data preference.
final CheckBoxPreference shareDataPreference = (CheckBoxPreference) findPreference(
getString(R.string.share_data_key));
shareDataPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
// Add a confirmation dialog for the "Allow access" preference.
final CheckBoxPreference allowAccessPreference = (CheckBoxPreference) findPreference(
getString(R.string.allow_access_key));
allowAccessPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if ((Boolean) newValue) {
AlertDialog dialog = new AlertDialog.Builder(SettingsActivity.this)
.setCancelable(true)
.setTitle(getString(R.string.settings_share_data))
.setMessage(getString(R.string.settings_share_data_dialog_message))
.setTitle(getString(R.string.settings_allow_access))
.setMessage(getString(R.string.settings_allow_access_dialog_message))
.setPositiveButton(android.R.string.ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int button) {
shareDataPreference.setChecked(true);
allowAccessPreference.setChecked(true);
}
})
.setNegativeButton(android.R.string.cancel, null)
MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class MyTracksProvider extends ContentProvider {
Context context = getContext();
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, 0);
return sharedPreferences.getBoolean(context.getString(R.string.share_data_key), false);
return sharedPreferences.getBoolean(context.getString(R.string.allow_access_key), false);
}
}
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+3 -3
View File
@@ -1036,7 +1036,7 @@ public class TrackRecordingService extends Service {
sendBroadcast(broadcastIntent, getString(R.string.mytracks_notifications_permission));
SharedPreferences sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
if (sharedPreferences.getBoolean(getString(R.string.share_data_key), false)) {
if (sharedPreferences.getBoolean(getString(R.string.allow_access_key), false)) {
sendBroadcast(broadcastIntent, getString(R.string.broadcast_notifications_permission));
}
}
@@ -1182,7 +1182,7 @@ public class TrackRecordingService extends Service {
/**
* Returns true if the RPC caller is from the same application or if the
* sharing setting indicates that another app can invoke this service's
* "Allow access" setting indicates that another app can invoke this service's
* RPCs.
*/
private boolean canAccess() {
@@ -1195,7 +1195,7 @@ public class TrackRecordingService extends Service {
} else {
SharedPreferences sharedPreferences = service.getSharedPreferences(
Constants.SETTINGS_NAME, 0);
return sharedPreferences.getBoolean(service.getString(R.string.share_data_key), false);
return sharedPreferences.getBoolean(service.getString(R.string.allow_access_key), false);
}
}