merge heads

MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java

@@ -31,6 +31,7 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
@@ -682,7 +683,9 @@ public class SettingsActivity extends PreferenceActivity {
       metricspeed = newValue;
     }
     SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-    prefs.edit().putString(getString(id), metricspeed).commit();
+    Editor editor = prefs.edit();
+    editor.putString(getString(id), metricspeed);
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);
   }
   
   /** 

MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java

@@ -16,6 +16,7 @@
 package com.google.android.apps.mytracks.io.backup;
 
 import com.google.android.apps.mytracks.content.ContentTypeIds;
+import com.google.android.apps.mytracks.util.ApiFeatures;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -77,15 +78,14 @@ class PreferenceBackupHelper {
    *
    * @param data the byte array to read preferences from
    * @param preferences the shared preferences to edit
-   * @return whether the preference change was successful
    * @throws IOException if there are any errors while reading
    */
-  public boolean importPreferences(byte[] data, SharedPreferences preferences)
+  public void importPreferences(byte[] data, SharedPreferences preferences)
       throws IOException {
     ByteArrayInputStream bufStream = new ByteArrayInputStream(data);
     DataInputStream reader = new DataInputStream(bufStream);
 
-    return importPreferences(reader, preferences);
+    importPreferences(reader, preferences);
   }
 
   /**
@@ -93,10 +93,9 @@ class PreferenceBackupHelper {
    *
    * @param reader the stream to read from
    * @param preferences the shared preferences to edit
-   * @return whether the preference change was successful
    * @throws IOException if there are any errors while reading
    */
-  public boolean importPreferences(DataInputStream reader,
+  public void importPreferences(DataInputStream reader,
       SharedPreferences preferences) throws IOException {
     Editor editor = preferences.edit();
     editor.clear();
@@ -107,8 +106,7 @@ class PreferenceBackupHelper {
       byte typeId = reader.readByte();
       readAndSetPreference(name, typeId, reader, editor);
     }
-
-    return editor.commit();
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);
   }
 
   /**

MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java

@@ -16,9 +16,11 @@
 package com.google.android.apps.mytracks.services;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.util.Log;
 
@@ -169,24 +171,21 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
   }
 
   public void setAutoResumeTrackCurrentRetry(int retryAttempts) {
-    sharedPreferences
-        .edit()
-        .putInt(autoResumeTrackCurrentRetryKey, retryAttempts)
-        .commit();
+    Editor editor = sharedPreferences.edit();
+    editor.putInt(autoResumeTrackCurrentRetryKey, retryAttempts);
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);
   }
 
   public void setRecordingTrack(long id) {
-    sharedPreferences
-        .edit()
-        .putLong(recordingTrackKey, id)
-        .commit();
+    Editor editor = sharedPreferences.edit();
+    editor.putLong(recordingTrackKey, id);
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);    
   }
 
   public void setSelectedTrack(long id) {
-    sharedPreferences
-        .edit()
-        .putLong(selectedTrackKey, id)
-        .commit();
+    Editor editor = sharedPreferences.edit();
+    editor.putLong(selectedTrackKey, id);
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);    
   }
 
   public void shutdown() {

MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java

@@ -17,13 +17,13 @@ package com.google.android.apps.mytracks.services.sensors.ant;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.maps.mytracks.R;
-
 import com.dsi.ant.AntDefine;
 import com.dsi.ant.AntMesg;
 import com.dsi.ant.exception.AntInterfaceException;
+import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.util.ApiFeatures;
+import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -135,7 +135,7 @@ public class AntDirectSensorManager extends AntSensorManager {
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     SharedPreferences.Editor editor = prefs.edit();
     editor.putInt(context.getString(R.string.ant_heart_rate_sensor_id_key), deviceNumberHRM);
-    editor.commit();
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);    
   }
 
   private void handleMessageResponse(byte[] rawMessage) {

MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java

@@ -22,6 +22,7 @@ import com.dsi.ant.AntMesg;
 import com.dsi.ant.exception.AntInterfaceException;
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -198,7 +199,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     SharedPreferences.Editor editor = prefs.edit();
     editor.putInt(context.getString(R.string.ant_srm_bridge_sensor_id_key), deviceNumber);
-    editor.commit();
+    ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);    
   }
 
   private void handleMessageResponse(byte[] rawMessage) {