aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/ImagesActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/ImagesActivity.java')
-rw-r--r--main/src/cgeo/geocaching/ImagesActivity.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index 0accf12..24f699e 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -24,11 +24,10 @@ public class ImagesActivity extends AbstractActivity {
private static final String EXTRAS_GEOCODE = "geocode";
private boolean offline;
- private ArrayList<cgImage> imageNames;
+ private ArrayList<Image> imageNames;
private ImagesList imagesList;
private ImageType imgType = ImageType.SpoilerImages;
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -62,7 +61,7 @@ public class ImagesActivity extends AbstractActivity {
return;
}
- offline = app.isOffline(geocode, null) && (imgType == ImageType.SpoilerImages || Settings.isStoreLogImages());
+ offline = cgData.isOffline(geocode, null) && (imgType == ImageType.SpoilerImages || Settings.isStoreLogImages());
}
@Override
@@ -78,24 +77,24 @@ public class ImagesActivity extends AbstractActivity {
super.onStop();
}
- public static void startActivityLogImages(final Context fromActivity, final String geocode, List<cgImage> logImages) {
+ public static void startActivityLogImages(final Context fromActivity, final String geocode, List<Image> logImages) {
startActivity(fromActivity, geocode, logImages, ImageType.LogImages);
}
- private static void startActivity(final Context fromActivity, final String geocode, List<cgImage> logImages, ImageType imageType) {
+ private static void startActivity(final Context fromActivity, final String geocode, List<Image> logImages, ImageType imageType) {
final Intent logImgIntent = new Intent(fromActivity, ImagesActivity.class);
// if resuming our app within this activity, finish it and return to the cache activity
logImgIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
- .putExtra(EXTRAS_GEOCODE, geocode.toUpperCase())
+ .putExtra(EXTRAS_GEOCODE, geocode)
.putExtra(EXTRAS_TYPE, imageType);
// avoid forcing the array list as parameter type
- final ArrayList<cgImage> arrayList = new ArrayList<cgImage>(logImages);
+ final ArrayList<Image> arrayList = new ArrayList<Image>(logImages);
logImgIntent.putParcelableArrayListExtra(EXTRAS_IMAGES, arrayList);
fromActivity.startActivity(logImgIntent);
}
- public static void startActivitySpoilerImages(final Context fromActivity, String geocode, List<cgImage> spoilers) {
+ public static void startActivitySpoilerImages(final Context fromActivity, String geocode, List<Image> spoilers) {
startActivity(fromActivity, geocode, spoilers, ImageType.SpoilerImages);
}