Isolate intent extras into a new class

1 files changed, 5 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index 64a086d..6669fdd 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -973,8 +973,8 @@ public class SettingsActivity extends AbstractActivity {
 
         switch (requestCode) {
             case SELECT_MAPFILE_REQUEST:
-                if (data.hasExtra("mapfile")) {
-                    final String mapFile = data.getStringExtra("mapfile");
+                if (data.hasExtra(Intents.EXTRA_MAP_FILE)) {
+                    final String mapFile = data.getStringExtra(Intents.EXTRA_MAP_FILE);
                     Settings.setMapFile(mapFile);
                     if (!Settings.isValidMapFile(Settings.getMapFile())) {
                         showToast(res.getString(R.string.warn_invalid_mapfile));
@@ -1032,9 +1032,8 @@ public class SettingsActivity extends AbstractActivity {
     }
 
     private void selectDirectory(String startDirectory, int directoryKind) {
-        Intent dirChooser;
         try {
-            dirChooser = new Intent(FileManagerIntents.ACTION_PICK_DIRECTORY);
+            final Intent dirChooser = new Intent(FileManagerIntents.ACTION_PICK_DIRECTORY);
             if (StringUtils.isNotBlank(startDirectory)) {
                 dirChooser.setData(Uri.parse("file://" + new File(startDirectory).getAbsolutePath()));
             }
@@ -1043,8 +1042,8 @@ public class SettingsActivity extends AbstractActivity {
             startActivityForResult(dirChooser, directoryKind);
         } catch (android.content.ActivityNotFoundException ex) {
             // OI file manager not available
-            dirChooser = new Intent(this, SimpleDirChooser.class);
-            dirChooser.putExtra(SimpleDirChooser.START_DIR, startDirectory);
+            final Intent dirChooser = new Intent(this, SimpleDirChooser.class);
+            dirChooser.putExtra(Intents.EXTRA_START_DIR, startDirectory);
             startActivityForResult(dirChooser, directoryKind);
         }
     }