Isolate intent extras into a new class

16 files changed, 105 insertions, 89 deletions

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index db9a04c..060012c 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -37,7 +37,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
     private static final int MENU_NAVIGATION = 3;
     private static final int MENU_DEFAULT_NAVIGATION = 2;
     private static final int MENU_SHOW_IN_BROWSER = 7;
-    protected static final String EXTRA_GEOCODE = "geocode";
 
     protected cgCache cache = null;
     protected String geocode = null;
@@ -137,7 +136,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         // get parameters
         final Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            geocode = extras.getString(EXTRA_GEOCODE);
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
         }
 
         if (StringUtils.isBlank(geocode)) {
diff --git a/main/src/cgeo/geocaching/AdressListActivity.java b/main/src/cgeo/geocaching/AdressListActivity.java
index 8ce16dd..e9f7ccf 100644
--- a/main/src/cgeo/geocaching/AdressListActivity.java
+++ b/main/src/cgeo/geocaching/AdressListActivity.java
@@ -27,7 +27,7 @@ public class AdressListActivity extends AbstractListActivity {
         setTitle(res.getString(R.string.search_address_result));
 
         // get parameters
-        final String keyword = getIntent().getStringExtra("keyword");
+        final String keyword = getIntent().getStringExtra(Intents.EXTRA_KEYWORD);
 
         if (keyword == null) {
             showToast(res.getString(R.string.err_search_address_forgot));
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 373536b..4359b05 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -217,9 +217,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         String name = null;
         String guid = null;
         if (geocode == null && extras != null) {
-            geocode = extras.getString("geocode");
-            name = extras.getString("name");
-            guid = extras.getString("guid");
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
+            name = extras.getString(Intents.EXTRA_NAME);
+            guid = extras.getString(Intents.EXTRA_GUID);
         }
 
         // try to get data from URI
@@ -894,7 +894,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     public static void startActivity(final Context context, final String geocode) {
         final Intent detailIntent = new Intent(context, CacheDetailActivity.class);
-        detailIntent.putExtra("geocode", geocode);
+        detailIntent.putExtra(Intents.EXTRA_GEOCODE, geocode);
         context.startActivity(detailIntent);
     }
 
@@ -2207,15 +2207,15 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     public static void startActivity(final Context context, final String geocode, final String cacheName) {
         final Intent cachesIntent = new Intent(context, CacheDetailActivity.class);
-        cachesIntent.putExtra("geocode", geocode);
-        cachesIntent.putExtra("name", cacheName);
+        cachesIntent.putExtra(Intents.EXTRA_GEOCODE, geocode);
+        cachesIntent.putExtra(Intents.EXTRA_NAME, cacheName);
         context.startActivity(cachesIntent);
     }
 
     public static void startActivityGuid(final Context context, final String guid, final String cacheName) {
         final Intent cacheIntent = new Intent(context, CacheDetailActivity.class);
-        cacheIntent.putExtra("guid", guid);
-        cacheIntent.putExtra("name", cacheName);
+        cacheIntent.putExtra(Intents.EXTRA_GUID, guid);
+        cacheIntent.putExtra(Intents.EXTRA_NAME, cacheName);
         context.startActivity(cacheIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index 3ee15da..731a30c 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -209,7 +209,7 @@ public class CachePopup extends AbstractPopupActivity {
 
     public static void startActivity(final Context context, final String geocode) {
         final Intent popupIntent = new Intent(context, CachePopup.class);
-        popupIntent.putExtra(EXTRA_GEOCODE, geocode);
+        popupIntent.putExtra(Intents.EXTRA_GEOCODE, geocode);
         context.startActivity(popupIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 7e089cf..54fcb52 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -113,9 +113,9 @@ public class EditWaypointActivity extends AbstractActivity {
         // get parameters
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            geocode = extras.getString("geocode");
-            wpCount = extras.getInt("count", 0);
-            id = extras.getInt("waypoint");
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
+            wpCount = extras.getInt(Intents.EXTRA_COUNT, 0);
+            id = extras.getInt(Intents.EXTRA_WAYPOINT_ID);
         }
 
         if (StringUtils.isBlank(geocode) && id <= 0) {
@@ -521,12 +521,12 @@ public class EditWaypointActivity extends AbstractActivity {
 
     public static void startActivityEditWaypoint(final Context context, final int waypointId) {
         context.startActivity(new Intent(context, EditWaypointActivity.class)
-                .putExtra("waypoint", waypointId));
+                .putExtra(Intents.EXTRA_WAYPOINT_ID, waypointId));
     }
 
     public static void startActivityAddWaypoint(final Context context, final cgCache cache) {
         context.startActivity(new Intent(context, EditWaypointActivity.class)
-                .putExtra("geocode", cache.getGeocode())
-                .putExtra("count", cache.getWaypoints().size()));
+                .putExtra(Intents.EXTRA_GEOCODE, cache.getGeocode())
+                .putExtra(Intents.EXTRA_COUNT, cache.getWaypoints().size()));
     }
 }
diff --git a/main/src/cgeo/geocaching/Intents.java b/main/src/cgeo/geocaching/Intents.java
new file mode 100644
index 0000000..07e1c13
--- /dev/null
+++ b/main/src/cgeo/geocaching/Intents.java
@@ -0,0 +1,28 @@
+package cgeo.geocaching;
+
+public class Intents {
+
+    private Intents() {
+        // Do not instantiate
+    }
+
+    private static final String PREFIX = "cgeo.geocaching.intent.extra.";
+
+    public static final String EXTRA_ADDRESS = PREFIX + "address";
+    public static final String EXTRAS_COORDS = PREFIX + "coords";
+    public static final String EXTRA_COUNT = PREFIX + "count";
+    public static final String EXTRA_GEOCODE = PREFIX + "geocode";
+    public static final String EXTRA_GUID = PREFIX + "guid";
+    public static final String EXTRA_ID = PREFIX + "id";
+    public static final String EXTRA_KEYWORD = PREFIX + "keyword";
+    public static final String EXTRA_KEYWORD_SEARCH = PREFIX + "keyword_search";
+    public static final String EXTRA_LIST_ID = PREFIX + "list_id";
+    public static final String EXTRA_LIST_TYPE = PREFIX + "list_type";
+    public static final String EXTRA_MAP_FILE = PREFIX + "map_file";
+    public static final String EXTRA_NAME = PREFIX + "name";
+    public static final String EXTRA_SEARCH = PREFIX + "search";
+    public static final String EXTRA_START_DIR = PREFIX + "start_dir";
+    public static final String EXTRA_TRACKING_CODE = PREFIX + "tracking_code";
+    public static final String EXTRA_USERNAME = PREFIX + "username";
+    public static final String EXTRA_WAYPOINT_ID = PREFIX + "waypoint_id";
+}
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 0217c08..34acb6f 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -119,11 +119,11 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
         // get parameters
         final Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            geocode = extras.getString("geocode");
-            guid = extras.getString("guid");
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
+            guid = extras.getString(Intents.EXTRA_GUID);
 
-            if (StringUtils.isNotBlank(extras.getString("trackingcode"))) {
-                ((EditText) findViewById(R.id.tracking)).setText(extras.getString("trackingcode"));
+            if (StringUtils.isNotBlank(extras.getString(Intents.EXTRA_TRACKING_CODE))) {
+                ((EditText) findViewById(R.id.tracking)).setText(extras.getString(Intents.EXTRA_TRACKING_CODE));
             }
         }
 
@@ -357,9 +357,9 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
     public static void startActivity(final Context context, final Trackable trackable) {
         final Intent logTouchIntent = new Intent(context, LogTrackableActivity.class);
-        logTouchIntent.putExtra("geocode", trackable.getGeocode());
-        logTouchIntent.putExtra("guid", trackable.getGuid());
-        logTouchIntent.putExtra("trackingcode", trackable.getTrackingcode());
+        logTouchIntent.putExtra(Intents.EXTRA_GEOCODE, trackable.getGeocode());
+        logTouchIntent.putExtra(Intents.EXTRA_GUID, trackable.getGuid());
+        logTouchIntent.putExtra(Intents.EXTRA_TRACKING_CODE, trackable.getTrackingcode());
         context.startActivity(logTouchIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 4c9a230..03ba5af 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -32,8 +32,6 @@ import java.util.Locale;
 
 public class SearchActivity extends AbstractActivity {
 
-    private static final String EXTRAS_KEYWORDSEARCH = "keywordsearch";
-
     private static final int MENU_SEARCH_OWN_CACHES = 1;
     private EditText latEdit = null;
     private EditText lonEdit = null;
@@ -50,7 +48,7 @@ public class SearchActivity extends AbstractActivity {
         Intent intent = getIntent();
         if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
             final String query = intent.getStringExtra(SearchManager.QUERY);
-            final boolean keywordSearch = intent.getBooleanExtra(EXTRAS_KEYWORDSEARCH, true);
+            final boolean keywordSearch = intent.getBooleanExtra(Intents.EXTRA_KEYWORD_SEARCH, true);
 
             if (instantSearch(query, keywordSearch)) {
                 setResult(RESULT_OK);
@@ -111,7 +109,7 @@ public class SearchActivity extends AbstractActivity {
         final IConnector connector = ConnectorFactory.getConnector(geocode);
         if (connector instanceof ISearchByGeocode) {
             final Intent cachesIntent = new Intent(this, CacheDetailActivity.class);
-            cachesIntent.putExtra("geocode", geocode.toUpperCase(Locale.US));
+            cachesIntent.putExtra(Intents.EXTRA_GEOCODE, geocode.toUpperCase(Locale.US));
             startActivity(cachesIntent);
             return true;
         }
@@ -120,7 +118,7 @@ public class SearchActivity extends AbstractActivity {
         final String trackable = BaseUtils.getMatch(query, GCConstants.PATTERN_TB_CODE, true, 0, "", false);
         if (StringUtils.isNotBlank(trackable)) {
             final Intent trackablesIntent = new Intent(this, TrackableActivity.class);
-            trackablesIntent.putExtra("geocode", trackable.toUpperCase(Locale.US));
+            trackablesIntent.putExtra(Intents.EXTRA_GEOCODE, trackable.toUpperCase(Locale.US));
             startActivity(trackablesIntent);
             return true;
         }
@@ -335,7 +333,7 @@ public class SearchActivity extends AbstractActivity {
         }
 
         final Intent addressesIntent = new Intent(this, AdressListActivity.class);
-        addressesIntent.putExtra("keyword", addText);
+        addressesIntent.putExtra(Intents.EXTRA_KEYWORD, addText);
         startActivity(addressesIntent);
     }
 
@@ -409,7 +407,7 @@ public class SearchActivity extends AbstractActivity {
         }
 
         final Intent trackablesIntent = new Intent(this, TrackableActivity.class);
-        trackablesIntent.putExtra("geocode", trackableText.toUpperCase(Locale.US));
+        trackablesIntent.putExtra(Intents.EXTRA_GEOCODE, trackableText.toUpperCase(Locale.US));
         startActivity(trackablesIntent);
     }
 
@@ -432,7 +430,7 @@ public class SearchActivity extends AbstractActivity {
         final Intent searchIntent = new Intent(fromActivity, SearchActivity.class);
         searchIntent.setAction(Intent.ACTION_SEARCH).
                 putExtra(SearchManager.QUERY, scan).
-                putExtra(SearchActivity.EXTRAS_KEYWORDSEARCH, false);
+                putExtra(Intents.EXTRA_KEYWORD_SEARCH, false);
         fromActivity.startActivityForResult(searchIntent, cgeo.SEARCH_REQUEST_CODE);
     }
 }
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);
         }
     }
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 5e21377..7365687 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -126,10 +126,10 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
 
         // try to get data from extras
         if (extras != null) {
-            geocode = extras.getString("geocode");
-            name = extras.getString("name");
-            guid = extras.getString("guid");
-            id = extras.getString("id");
+            geocode = extras.getString(Intents.EXTRA_GEOCODE);
+            name = extras.getString(Intents.EXTRA_NAME);
+            guid = extras.getString(Intents.EXTRA_GUID);
+            id = extras.getString(Intents.EXTRA_ID);
         }
 
         // try to get data from URI
@@ -357,9 +357,9 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
     public static void startActivity(final AbstractActivity fromContext,
             final String guid, final String geocode, final String name) {
         final Intent trackableIntent = new Intent(fromContext, TrackableActivity.class);
-        trackableIntent.putExtra("guid", guid);
-        trackableIntent.putExtra("geocode", geocode);
-        trackableIntent.putExtra("name", name);
+        trackableIntent.putExtra(Intents.EXTRA_GUID, guid);
+        trackableIntent.putExtra(Intents.EXTRA_GEOCODE, geocode);
+        trackableIntent.putExtra(Intents.EXTRA_NAME, name);
         fromContext.startActivity(trackableIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index a69b729..1d18987 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -17,7 +17,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class WaypointPopup extends AbstractPopupActivity {
-    private static final String EXTRA_WAYPOINT_ID = "waypoint_id";
     private int waypointId = 0;
     private Waypoint waypoint = null;
 
@@ -31,7 +30,7 @@ public class WaypointPopup extends AbstractPopupActivity {
         // get parameters
         final Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            waypointId = extras.getInt(EXTRA_WAYPOINT_ID);
+            waypointId = extras.getInt(Intents.EXTRA_WAYPOINT_ID);
         }
     }
 
@@ -97,8 +96,8 @@ public class WaypointPopup extends AbstractPopupActivity {
 
     public static void startActivity(final Context context, final int waypointId, final String geocode) {
         final Intent popupIntent = new Intent(context, WaypointPopup.class);
-        popupIntent.putExtra(EXTRA_WAYPOINT_ID, waypointId);
-        popupIntent.putExtra(EXTRA_GEOCODE, geocode);
+        popupIntent.putExtra(Intents.EXTRA_WAYPOINT_ID, waypointId);
+        popupIntent.putExtra(Intents.EXTRA_GEOCODE, geocode);
         context.startActivity(popupIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/cgSelectMapfile.java b/main/src/cgeo/geocaching/cgSelectMapfile.java
index 3757c4f..ded81a7 100644
--- a/main/src/cgeo/geocaching/cgSelectMapfile.java
+++ b/main/src/cgeo/geocaching/cgSelectMapfile.java
@@ -31,7 +31,7 @@ public class cgSelectMapfile extends FileList<FileSelectionListAdapter> implemen
     public void close() {
 
         Intent intent = new Intent();
-        intent.putExtra("mapfile", mapFile);
+        intent.putExtra(Intents.EXTRA_MAP_FILE, mapFile);
 
         setResult(RESULT_OK, intent);
 
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index fa83a60..64224f6 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -72,12 +72,6 @@ import java.util.Set;
 
 public class cgeocaches extends AbstractListActivity implements FilteredActivity {
 
-    private static final String EXTRAS_USERNAME = "username";
-    private static final String EXTRAS_ADDRESS = "address";
-    private static final String EXTRAS_SEARCH = "search";
-    private static final String EXTRAS_KEYWORD = "keyword";
-    private static final String EXTRAS_LIST_TYPE = "type";
-    private static final String EXTRAS_COORDS = "coords";
     private static final int MAX_LIST_ITEMS = 1000;
     private static final int MENU_REFRESH_STORED = 2;
     private static final int MENU_CACHE_DETAILS = 4;
@@ -455,9 +449,9 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         // get parameters
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            Object typeObject = extras.get(EXTRAS_LIST_TYPE);
+            Object typeObject = extras.get(Intents.EXTRA_LIST_TYPE);
             type = (typeObject instanceof CacheListType) ? (CacheListType) typeObject : CacheListType.OFFLINE;
-            coords = (Geopoint) extras.getParcelable(EXTRAS_COORDS);
+            coords = (Geopoint) extras.getParcelable(Intents.EXTRAS_COORDS);
         }
         else {
             extras = new Bundle();
@@ -480,7 +474,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         Thread threadPure;
         AbstractSearchThread thread;
 
-        final String username = extras.getString(EXTRAS_USERNAME);
+        final String username = extras.getString(Intents.EXTRA_USERNAME);
         switch (type) {
             case OFFLINE:
                 listId = Settings.getLastList();
@@ -532,7 +526,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 thread.start();
                 break;
             case KEYWORD:
-                final String keyword = extras.getString(EXTRAS_KEYWORD);
+                final String keyword = extras.getString(Intents.EXTRA_KEYWORD);
                 title = keyword;
                 setTitle(title);
                 showProgress(true);
@@ -543,7 +537,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 thread.start();
                 break;
             case ADDRESS:
-                final String address = extras.getString(EXTRAS_ADDRESS);
+                final String address = extras.getString(Intents.EXTRA_ADDRESS);
                 if (StringUtils.isNotBlank(address)) {
                     title = address;
                 } else {
@@ -586,7 +580,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 title = res.getString(R.string.map_map);
                 setTitle(title);
                 showProgress(true);
-                search = (SearchResult) extras.get(EXTRAS_SEARCH);
+                search = (SearchResult) extras.get(Intents.EXTRA_SEARCH);
                 replaceCacheListFromSearch();
                 loadCachesHandler.sendMessage(Message.obtain());
                 break;
@@ -1023,8 +1017,8 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
                 break;
             case MENU_CACHE_DETAILS:
                 final Intent cachesIntent = new Intent(this, CacheDetailActivity.class);
-                cachesIntent.putExtra("geocode", cache.getGeocode());
-                cachesIntent.putExtra("name", cache.getName());
+                cachesIntent.putExtra(Intents.EXTRA_GEOCODE, cache.getGeocode());
+                cachesIntent.putExtra(Intents.EXTRA_NAME, cache.getName());
                 startActivity(cachesIntent);
                 break;
             case MENU_DROP_CACHE:
@@ -1823,7 +1817,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
 
     public static void startActivityOffline(final Context context) {
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.OFFLINE);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.OFFLINE);
         context.startActivity(cachesIntent);
     }
 
@@ -1832,8 +1826,8 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             return;
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.OWNER);
-        cachesIntent.putExtra(EXTRAS_USERNAME, userName);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.OWNER);
+        cachesIntent.putExtra(Intents.EXTRA_USERNAME, userName);
         context.startActivity(cachesIntent);
     }
 
@@ -1850,8 +1844,8 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             return;
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.USERNAME);
-        cachesIntent.putExtra(EXTRAS_USERNAME, userName);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.USERNAME);
+        cachesIntent.putExtra(Intents.EXTRA_USERNAME, userName);
         context.startActivity(cachesIntent);
     }
 
@@ -1902,22 +1896,22 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             return;
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.NEAREST);
-        cachesIntent.putExtra(EXTRAS_COORDS, coordsNow);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.NEAREST);
+        cachesIntent.putExtra(Intents.EXTRAS_COORDS, coordsNow);
         context.startActivity(cachesIntent);
     }
 
     public static void startActivityHistory(Context context) {
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.HISTORY);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.HISTORY);
         context.startActivity(cachesIntent);
     }
 
     public static void startActivityAddress(final Context context, final Geopoint coords, final String address) {
         final Intent addressIntent = new Intent(context, cgeocaches.class);
-        addressIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.ADDRESS);
-        addressIntent.putExtra(EXTRAS_COORDS, coords);
-        addressIntent.putExtra(EXTRAS_ADDRESS, address);
+        addressIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.ADDRESS);
+        addressIntent.putExtra(Intents.EXTRAS_COORDS, coords);
+        addressIntent.putExtra(Intents.EXTRA_ADDRESS, address);
         context.startActivity(addressIntent);
     }
 
@@ -1926,8 +1920,8 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             return;
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.COORDINATE);
-        cachesIntent.putExtra(EXTRAS_COORDS, coords);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.COORDINATE);
+        cachesIntent.putExtra(Intents.EXTRAS_COORDS, coords);
         context.startActivity(cachesIntent);
     }
 
@@ -1945,15 +1939,15 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             return;
         }
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.KEYWORD);
-        cachesIntent.putExtra(EXTRAS_KEYWORD, keyword);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.KEYWORD);
+        cachesIntent.putExtra(Intents.EXTRA_KEYWORD, keyword);
         context.startActivity(cachesIntent);
     }
 
     public static void startActivityMap(final Context context, final SearchResult search) {
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
-        cachesIntent.putExtra(EXTRAS_LIST_TYPE, CacheListType.MAP);
-        cachesIntent.putExtra(EXTRAS_SEARCH, search);
+        cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.MAP);
+        cachesIntent.putExtra(Intents.EXTRA_SEARCH, search);
         context.startActivity(cachesIntent);
     }
 }
diff --git a/main/src/cgeo/geocaching/cgeogpxes.java b/main/src/cgeo/geocaching/cgeogpxes.java
index 909263f..4f38734 100644
--- a/main/src/cgeo/geocaching/cgeogpxes.java
+++ b/main/src/cgeo/geocaching/cgeogpxes.java
@@ -17,7 +17,6 @@ import java.util.Collections;
 import java.util.List;

 

 public class cgeogpxes extends FileList<GPXListAdapter> {

-    private static final String EXTRAS_LIST_ID = "list";

 

     public cgeogpxes() {

         super(new String[] { "gpx", "loc", "zip" });

@@ -41,7 +40,7 @@ public class cgeogpxes extends FileList<GPXListAdapter> {
 

         final Bundle extras = getIntent().getExtras();

         if (extras != null) {

-            listId = extras.getInt(EXTRAS_LIST_ID);

+            listId = extras.getInt(Intents.EXTRA_LIST_ID);

         }

         if (listId <= StoredList.TEMPORARY_LIST_ID) {

             listId = StoredList.STANDARD_LIST_ID;

@@ -55,7 +54,7 @@ public class cgeogpxes extends FileList<GPXListAdapter> {
 

     public static void startSubActivity(Activity fromActivity, int listId) {

         final Intent intent = new Intent(fromActivity, cgeogpxes.class);

-        intent.putExtra(EXTRAS_LIST_ID, listId);

+        intent.putExtra(Intents.EXTRA_LIST_ID, listId);

         fromActivity.startActivityForResult(intent, 0);

     }

 

diff --git a/main/src/cgeo/geocaching/files/FileList.java b/main/src/cgeo/geocaching/files/FileList.java
index 42c9f16..4bd2608 100644
--- a/main/src/cgeo/geocaching/files/FileList.java
+++ b/main/src/cgeo/geocaching/files/FileList.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.files;
 
+import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
 import cgeo.geocaching.StoredList;
 import cgeo.geocaching.activity.AbstractListActivity;
@@ -92,7 +93,7 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            listId = extras.getInt("list");
+            listId = extras.getInt(Intents.EXTRA_LIST_ID);
         }
         if (listId <= StoredList.TEMPORARY_LIST_ID) {
             listId = StoredList.STANDARD_LIST_ID;
diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index c59b0cb..7487708 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.files;
 
+import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
 import cgeo.geocaching.activity.ActivityMixin;
 
@@ -30,8 +31,6 @@ import java.util.List;
  * Dialog for choosing a file or directory.
  */
 public class SimpleDirChooser extends ListActivity {
-    public static final String EXTRA_CHOSEN_DIR = "chosenDir";
-    public static final String START_DIR = "start_dir";
     private static final String PARENT_DIR = "..        ";
     private File currentDir;
     private FileArrayAdapter adapter;
@@ -42,7 +41,7 @@ public class SimpleDirChooser extends ListActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Bundle extras = getIntent().getExtras();
-        currentDir = dirContaining(extras.getString(START_DIR));
+        currentDir = dirContaining(extras.getString(Intents.EXTRA_START_DIR));
 
         ActivityMixin.setTheme(this);
         setContentView(R.layout.simple_dir_chooser);