Encapsulate settings change in helper function in ParameterNode

Intermodalics · Jun 20, 2017 · fa2ed0a · fa2ed0a
1 parent 69d54fd
commit fa2ed0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...mer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java b/...mer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java
@@ -349,12 +349,8 @@ public void run() {
                     mSnackbarLoadNewMap.setAction(getString(R.string.snackbar_action_text_load_new_map), new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            SharedPreferences.Editor editor = mSharedPref.edit();
-                            editor.putBoolean(getString(R.string.pref_create_new_map_key), false);
-                            editor.putString(getString(R.string.pref_localization_mode_key), "3");
-                            editor.putString(getString(R.string.pref_localization_map_uuid_key), mapUuid);
-                            editor.commit();
-                            mParameterNode.uploadPreferencesToParameterServer();
+                            mParameterNode.changeSettingsToLocalizeInMap(mapUuid, getString(R.string.pref_create_new_map_key),
+                                    getString(R.string.pref_localization_mode_key), getString(R.string.pref_localization_map_uuid_key));
                             restartTango();
                         }
                     });

diff --git a/...ommon/tango_ros_common/src/main/java/eu/intermodalics/tango_ros_common/ParameterNode.java b/...ommon/tango_ros_common/src/main/java/eu/intermodalics/tango_ros_common/ParameterNode.java
@@ -20,8 +20,6 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import eu.intermodalics.tango_ros_common.NodeNamespaceHelper;
-
 import org.apache.commons.logging.Log;
 import org.ros.namespace.GraphName;
 import org.ros.node.AbstractNodeMain;
@@ -125,4 +123,14 @@ public void setPreferencesFromParameterServer() {
         }
         editor.commit();
     }
+
+    public void changeSettingsToLocalizeInMap(final String mapUuid, final String prefCreateNewMapKey,
+                                              final String prefLocalizationModeKey, final String prefLocalizationMapUuidKey) {
+        SharedPreferences.Editor editor = mSharedPreferences.edit();
+        editor.putBoolean(prefCreateNewMapKey, false);
+        editor.putString(prefLocalizationModeKey, "3");
+        editor.putString(prefLocalizationMapUuidKey, mapUuid);
+        editor.commit();
+        uploadPreferencesToParameterServer();
+    }
 }