From 4c68aa0543c06e785d493f126570bdc72e2f500a Mon Sep 17 00:00:00 2001 From: Gerald Barker Date: Sun, 4 Sep 2011 12:09:52 +0100 Subject: Fixes to errors made while refactoring for #301 --- src/cgeo/geocaching/StaticMapsProvider.java | 2 +- src/cgeo/geocaching/cgBase.java | 31 +++++++++++++++++++++-------- src/cgeo/geocaching/cgeoapplication.java | 3 +-- src/cgeo/geocaching/cgeodetail.java | 4 ++-- src/cgeo/geocaching/cgeotouch.java | 7 +++---- src/cgeo/geocaching/cgeovisit.java | 7 +++---- 6 files changed, 33 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/cgeo/geocaching/StaticMapsProvider.java b/src/cgeo/geocaching/StaticMapsProvider.java index 5962460..50605df 100644 --- a/src/cgeo/geocaching/StaticMapsProvider.java +++ b/src/cgeo/geocaching/StaticMapsProvider.java @@ -124,7 +124,7 @@ public class StaticMapsProvider { public static void downloadMaps(cgCache cache, cgSettings settings, Activity activity) { if (settings.storeOfflineMaps != 1 || cache.latitude == null - || cache.longitude == null || StringUtils.isNotBlank(cache.geocode)) { + || cache.longitude == null || StringUtils.isBlank(cache.geocode)) { return; } diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java index eb8273f..dfb0e8b 100644 --- a/src/cgeo/geocaching/cgBase.java +++ b/src/cgeo/geocaching/cgBase.java @@ -464,7 +464,7 @@ public class cgBase { * put viewstates into request parameters */ private static void setViewstates(String[] viewstates, HashMap params) { - if (ArrayUtils.isEmpty(viewstates)) + if (isEmpty(viewstates)) return; params.put("__VIEWSTATE", viewstates[0]); if (viewstates.length > 1) { @@ -475,6 +475,21 @@ public class cgBase { } /** + * checks if an Array of Strings is empty or not. Empty means: + * - Array is null + * - or all elements are null or empty strings + */ + public static boolean isEmpty(String[] a) { + if (a == null) + return true; + + for (String s: a) + if (StringUtils.isNotEmpty(s)) + return false; + return true; + } + + /** * transfers the viewstates variables from a page (response) to parameters * (next request) */ @@ -518,7 +533,7 @@ public class cgBase { viewstates = getViewstates(loginData); - if (ArrayUtils.isEmpty(viewstates)) { + if (isEmpty(viewstates)) { Log.e(cgSettings.tag, "cgeoBase.login: Failed to find viewstates"); return -1; // no viewstates } @@ -2746,7 +2761,7 @@ public class cgBase { return searchId; } - if (ArrayUtils.isEmpty(viewstates)) { + if (isEmpty(viewstates)) { Log.e(cgSettings.tag, "cgeoBase.searchByNextPage: No viewstate given"); return searchId; } @@ -2832,7 +2847,7 @@ public class cgBase { } if (forceReload == false && reason == 0 && (app.isOffline(geocode, guid) || app.isThere(geocode, guid, true, true))) { - if (StringUtils.isBlank(geocode) && StringUtils.isBlank(guid)) { + if (StringUtils.isBlank(geocode) && StringUtils.isNotBlank(guid)) { geocode = app.getGeocode(guid); } @@ -2865,7 +2880,7 @@ public class cgBase { if (StringUtils.isEmpty(page)) { if (app.isThere(geocode, guid, true, false)) { - if (StringUtils.isBlank(geocode) && StringUtils.isBlank(guid)) { + if (StringUtils.isBlank(geocode) && StringUtils.isNotBlank(guid)) { Log.i(cgSettings.tag, "Loading old cache from cache."); geocode = app.getGeocode(guid); @@ -3445,7 +3460,7 @@ public class cgBase { public int postLog(cgeoapplication app, String geocode, String cacheid, String[] viewstates, int logType, int year, int month, int day, String log, ArrayList trackables) { - if (ArrayUtils.isEmpty(viewstates)) { + if (isEmpty(viewstates)) { Log.e(cgSettings.tag, "cgeoBase.postLog: No viewstate given"); return 1000; } @@ -3607,7 +3622,7 @@ public class cgBase { public int postLogTrackable(String tbid, String trackingCode, String[] viewstates, int logType, int year, int month, int day, String log) { - if (ArrayUtils.isEmpty(viewstates)) { + if (isEmpty(viewstates)) { Log.e(cgSettings.tag, "cgeoBase.postLogTrackable: No viewstate given"); return 1000; } @@ -3800,7 +3815,7 @@ public class cgBase { if (app == null) { return; } - if (settings == null || StringUtils.isBlank(settings.tokenPublic) || StringUtils.isNotBlank(settings.tokenSecret)) { + if (settings == null || StringUtils.isBlank(settings.tokenPublic) || StringUtils.isBlank(settings.tokenSecret)) { return; } diff --git a/src/cgeo/geocaching/cgeoapplication.java b/src/cgeo/geocaching/cgeoapplication.java index 6095271..b092728 100644 --- a/src/cgeo/geocaching/cgeoapplication.java +++ b/src/cgeo/geocaching/cgeoapplication.java @@ -6,7 +6,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import android.app.Application; @@ -269,7 +268,7 @@ public class cgeoapplication extends Application { } public boolean setViewstates(Long searchId, String[] viewstates) { - if (ArrayUtils.isEmpty(viewstates)) { + if (cgBase.isEmpty(viewstates)) { return false; } if (searchId == null || searches.containsKey(searchId) == false) { diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java index 7a7cee0..2466b66 100644 --- a/src/cgeo/geocaching/cgeodetail.java +++ b/src/cgeo/geocaching/cgeodetail.java @@ -610,11 +610,11 @@ public class cgeodetail extends AbstractActivity { try { - if (StringUtils.isBlank(geocode)) { + if (StringUtils.isNotBlank(geocode)) { geocode = cache.geocode; } - if (StringUtils.isBlank(guid)) { + if (StringUtils.isNotBlank(guid)) { guid = cache.guid; } diff --git a/src/cgeo/geocaching/cgeotouch.java b/src/cgeo/geocaching/cgeotouch.java index f75ced7..6ee5f2c 100644 --- a/src/cgeo/geocaching/cgeotouch.java +++ b/src/cgeo/geocaching/cgeotouch.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import android.app.Dialog; @@ -49,7 +48,7 @@ public class cgeotouch extends cgLogForm { private Handler loadDataHandler = new Handler() { @Override public void handleMessage(Message msg) { - if (ArrayUtils.isEmpty(viewstates) && attempts < 2) { + if (cgBase.isEmpty(viewstates) && attempts < 2) { showToast(res.getString(R.string.err_log_load_data_again)); loadData thread; @@ -57,7 +56,7 @@ public class cgeotouch extends cgLogForm { thread.start(); return; - } else if (ArrayUtils.isEmpty(viewstates) && attempts >= 2) { + } else if (cgBase.isEmpty(viewstates) && attempts >= 2) { showToast(res.getString(R.string.err_log_load_data)); showProgress(false); @@ -288,7 +287,7 @@ public class cgeotouch extends cgLogForm { tweetCheck.setChecked(true); Button buttonPost = (Button)findViewById(R.id.post); - if (ArrayUtils.isEmpty(viewstates)) { + if (cgBase.isEmpty(viewstates)) { buttonPost.setEnabled(false); buttonPost.setOnTouchListener(null); buttonPost.setOnClickListener(null); diff --git a/src/cgeo/geocaching/cgeovisit.java b/src/cgeo/geocaching/cgeovisit.java index 924ea7f..cb8c500 100644 --- a/src/cgeo/geocaching/cgeovisit.java +++ b/src/cgeo/geocaching/cgeovisit.java @@ -6,7 +6,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Locale; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import android.app.Dialog; @@ -83,7 +82,7 @@ public class cgeovisit extends cgLogForm { showToast(res.getString(R.string.info_log_type_changed)); } - if (ArrayUtils.isEmpty(viewstates) && attempts < 2) { + if (cgBase.isEmpty(viewstates) && attempts < 2) { showToast(res.getString(R.string.err_log_load_data_again)); loadData thread; @@ -91,7 +90,7 @@ public class cgeovisit extends cgLogForm { thread.start(); return; - } else if (ArrayUtils.isEmpty(viewstates) && attempts >= 2) { + } else if (cgBase.isEmpty(viewstates) && attempts >= 2) { showToast(res.getString(R.string.err_log_load_data)); showProgress(false); @@ -548,7 +547,7 @@ public class cgeovisit extends cgLogForm { if (post == null) { post = (Button) findViewById(R.id.post); } - if (ArrayUtils.isEmpty(viewstates)) { + if (cgBase.isEmpty(viewstates)) { post.setEnabled(false); post.setOnTouchListener(null); post.setOnClickListener(null); -- cgit v1.1 From 188a1198230f53520fe97698e1b8c556a02b3f3c Mon Sep 17 00:00:00 2001 From: Gerald Barker Date: Sun, 4 Sep 2011 12:13:17 +0100 Subject: add braces to the for and if in cgBase.isEmpty() to make it more readable --- src/cgeo/geocaching/cgBase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java index dfb0e8b..a491b8f 100644 --- a/src/cgeo/geocaching/cgBase.java +++ b/src/cgeo/geocaching/cgBase.java @@ -483,9 +483,11 @@ public class cgBase { if (a == null) return true; - for (String s: a) - if (StringUtils.isNotEmpty(s)) + for (String s: a) { + if (StringUtils.isNotEmpty(s)) { return false; + } + } return true; } -- cgit v1.1 From bb8db36db3a2b80399cee4031c1d1b71d828b0de Mon Sep 17 00:00:00 2001 From: Gerald Barker Date: Sun, 4 Sep 2011 21:54:48 +0100 Subject: More errors found in refactor for #301 --- src/cgeo/geocaching/cgBase.java | 27 ++++++++++++------------- src/cgeo/geocaching/cgeoauth.java | 2 +- src/cgeo/geocaching/cgeodetail.java | 4 ++-- src/cgeo/geocaching/cgeovisit.java | 2 +- src/cgeo/geocaching/cgeowaypointadd.java | 4 ++-- src/cgeo/geocaching/mapcommon/cgMapOverlay.java | 2 +- 6 files changed, 20 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java index a491b8f..7b9e365 100644 --- a/src/cgeo/geocaching/cgBase.java +++ b/src/cgeo/geocaching/cgBase.java @@ -464,7 +464,7 @@ public class cgBase { * put viewstates into request parameters */ private static void setViewstates(String[] viewstates, HashMap params) { - if (isEmpty(viewstates)) + if (ArrayUtils.isEmpty(viewstates)) return; params.put("__VIEWSTATE", viewstates[0]); if (viewstates.length > 1) { @@ -475,6 +475,14 @@ public class cgBase { } /** + * transfers the viewstates variables from a page (response) to parameters + * (next request) + */ + public static void transferViewstates(String page, HashMap params) { + setViewstates(getViewstates(page), params); + } + + /** * checks if an Array of Strings is empty or not. Empty means: * - Array is null * - or all elements are null or empty strings @@ -491,14 +499,6 @@ public class cgBase { return true; } - /** - * transfers the viewstates variables from a page (response) to parameters - * (next request) - */ - public static void transferViewstates(String page, HashMap params) { - setViewstates(getViewstates(page), params); - } - public class loginThread extends Thread { @@ -1036,7 +1036,7 @@ public class cgBase { final JSONObject dataJSON = new JSONObject(json); final JSONObject extra = dataJSON.getJSONObject("cs"); - if ( StringUtils.isNotBlank(data)) { + if (extra != null && extra.length() > 0) { int count = extra.getInt("count"); if (count > 0 && extra.has("cc")) { @@ -3015,7 +3015,7 @@ public class cgBase { return null; } - if (StringUtils.isBlank(latitude)) { + if (StringUtils.isBlank(cacheType)) { cacheType = null; } @@ -3559,7 +3559,7 @@ public class cgBase { if (matcher.find() && matcher.groupCount() > 0) { final String[] viewstatesConfirm = getViewstates(page); - if (ArrayUtils.isEmpty(viewstatesConfirm)) { + if (isEmpty(viewstatesConfirm)) { Log.e(cgSettings.tag, "cgeoBase.postLog: No viewstate for confirm log"); return 1000; } @@ -4202,7 +4202,7 @@ public class cgBase { response = request(secureRedir, newLocation.getHost(), newLocation.getPath(), "GET", new HashMap(), requestId, false, false, false); } } else { - if (StringUtils.isNotBlank(buffer)) { + if (StringUtils.isNotEmpty(buffer)) { replaceWhitespace(buffer); String data = buffer.toString(); buffer = null; @@ -5051,7 +5051,6 @@ public class cgBase { gcIcons.put("mystery-disabled", R.drawable.marker_cache_mystery_disabled); gcIcons.put("gchq-disabled", R.drawable.marker_cache_gchq_disabled); } - } public static boolean runNavigation(Activity activity, Resources res, cgSettings settings, Double latitude, Double longitude) { diff --git a/src/cgeo/geocaching/cgeoauth.java b/src/cgeo/geocaching/cgeoauth.java index 6dc6aea..f643826 100644 --- a/src/cgeo/geocaching/cgeoauth.java +++ b/src/cgeo/geocaching/cgeoauth.java @@ -121,7 +121,7 @@ public class cgeoauth extends AbstractActivity { startButton.setEnabled(true); startButton.setOnClickListener(new startListener()); - if (StringUtils.isNotBlank(OAtoken) && StringUtils.isNotBlank(OAtokenSecret)) { + if (StringUtils.isBlank(OAtoken) && StringUtils.isBlank(OAtokenSecret)) { // start authorization process startButton.setText(res.getString(R.string.auth_start)); } else { diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java index 2466b66..6874ef7 100644 --- a/src/cgeo/geocaching/cgeodetail.java +++ b/src/cgeo/geocaching/cgeodetail.java @@ -610,11 +610,11 @@ public class cgeodetail extends AbstractActivity { try { - if (StringUtils.isNotBlank(geocode)) { + if (geocode == null && StringUtils.isNotBlank(cache.geocode)) { geocode = cache.geocode; } - if (StringUtils.isNotBlank(guid)) { + if (guid == null && StringUtils.isNotBlank(cache.guid)) { guid = cache.guid; } diff --git a/src/cgeo/geocaching/cgeovisit.java b/src/cgeo/geocaching/cgeovisit.java index cb8c500..83b4d58 100644 --- a/src/cgeo/geocaching/cgeovisit.java +++ b/src/cgeo/geocaching/cgeovisit.java @@ -240,7 +240,7 @@ public class cgeovisit extends cgLogForm { if ((StringUtils.isBlank(cacheid)) && StringUtils.isNotBlank(geocode)) { cacheid = app.getCacheid(geocode); } - if ((StringUtils.isBlank(geocode)) && StringUtils.isNotBlank(cacheid)) { + if (StringUtils.isBlank(geocode) && StringUtils.isNotBlank(cacheid)) { geocode = app.getGeocode(cacheid); } diff --git a/src/cgeo/geocaching/cgeowaypointadd.java b/src/cgeo/geocaching/cgeowaypointadd.java index 3b6c3eb..bbfc458 100644 --- a/src/cgeo/geocaching/cgeowaypointadd.java +++ b/src/cgeo/geocaching/cgeowaypointadd.java @@ -247,8 +247,8 @@ public class cgeowaypointadd extends AbstractActivity { final String latText = ((Button) findViewById(R.id.buttonLatitude)).getText().toString(); final String lonText = ((Button) findViewById(R.id.buttonLongitude)).getText().toString(); - if (StringUtils.isNotBlank(bearingText) && StringUtils.isNotBlank(distanceText) - && StringUtils.isNotBlank(latText) && StringUtils.isNotBlank(lonText)) { + if (StringUtils.isBlank(bearingText) && StringUtils.isBlank(distanceText) + && StringUtils.isBlank(latText) && StringUtils.isBlank(lonText)) { helpDialog(res.getString(R.string.err_point_no_position_given_title), res.getString(R.string.err_point_no_position_given)); return; } diff --git a/src/cgeo/geocaching/mapcommon/cgMapOverlay.java b/src/cgeo/geocaching/mapcommon/cgMapOverlay.java index 2b8406e..0ae8827 100644 --- a/src/cgeo/geocaching/mapcommon/cgMapOverlay.java +++ b/src/cgeo/geocaching/mapcommon/cgMapOverlay.java @@ -201,7 +201,7 @@ public class cgMapOverlay extends ItemizedOverlayBase implements OverlayBase { cgCoord coordinate = item.getCoord(); - if (coordinate.type != null && coordinate.type.equalsIgnoreCase("cache") && StringUtils.isNotBlank(coordinate.geocode)) { + if (StringUtils.isNotBlank(coordinate.type) && coordinate.type.equalsIgnoreCase("cache") && StringUtils.isNotBlank(coordinate.geocode)) { Intent popupIntent = new Intent(context, cgeopopup.class); popupIntent.putExtra("fromdetail", fromDetail); -- cgit v1.1 From 15b1dff09a9c91aade7a147b5a967b6bb1c71755 Mon Sep 17 00:00:00 2001 From: cachapa Date: Tue, 6 Sep 2011 11:11:56 +0200 Subject: Increase target area for clicking the icons in the main grid. Even if the tap falls outside of the button, it is still caught by the surrounding layout and redirected to the button. --- src/cgeo/geocaching/cgeo.java | 105 ++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 45 deletions(-) (limited to 'src') diff --git a/src/cgeo/geocaching/cgeo.java b/src/cgeo/geocaching/cgeo.java index ceaf3b9..d4defc7 100644 --- a/src/cgeo/geocaching/cgeo.java +++ b/src/cgeo/geocaching/cgeo.java @@ -27,6 +27,7 @@ import android.view.ContextMenu; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.View.OnClickListener; import android.widget.RelativeLayout; import android.widget.TextView; import cgeo.geocaching.activity.AbstractActivity; @@ -452,32 +453,47 @@ public class cgeo extends AbstractActivity { final View findOnMap = findViewById(R.id.map); findOnMap.setClickable(true); - findOnMap.setOnClickListener(new cgeoFindOnMapListener()); + findOnMap.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + cgeoFindOnMap(v); + } + }); final View findByOffline = findViewById(R.id.search_offline); findByOffline.setClickable(true); - findByOffline.setOnClickListener(new cgeoFindByOfflineListener()); + findByOffline.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + cgeoFindByOffline(v); + } + }); registerForContextMenu(findByOffline); (new countBubbleUpdate()).start(); final View advanced = findViewById(R.id.advanced_button); advanced.setClickable(true); - advanced.setOnClickListener(new cgeoSearchListener()); + advanced.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + cgeoSearch(v); + } + }); final View any = findViewById(R.id.any_button); any.setClickable(true); - any.setOnClickListener(new cgeoPointListener()); + any.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + cgeoPoint(v); + } + }); final View filter = findViewById(R.id.filter_button); + filter.setClickable(true); registerForContextMenu(filter); filter.setOnClickListener(new View.OnClickListener() { - - public void onClick(View view) { - openContextMenu(view); + public void onClick(View v) { + openContextMenu(v); } }); - filter.setClickable(true); setFilterTitle(); } @@ -501,7 +517,11 @@ public class cgeo extends AbstractActivity { if (geo.latitudeNow != null && geo.longitudeNow != null) { View findNearest = findViewById(R.id.nearest); findNearest.setClickable(true); - findNearest.setOnClickListener(new cgeoFindNearestListener()); + findNearest.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + cgeoFindNearest(v); + } + }); findNearest.setBackgroundResource(R.drawable.main_nearby); String satellites = null; @@ -569,50 +589,45 @@ public class cgeo extends AbstractActivity { } } - private class cgeoFindNearestListener implements View.OnClickListener { - - public void onClick(View arg0) { - if (geo == null) { - return; - } - - final Intent cachesIntent = new Intent(context, cgeocaches.class); - cachesIntent.putExtra("type", "nearest"); - cachesIntent.putExtra("latitude", geo.latitudeNow); - cachesIntent.putExtra("longitude", geo.longitudeNow); - cachesIntent.putExtra("cachetype", settings.cacheType); - context.startActivity(cachesIntent); - } + public void cgeoFindOnMap(View v) { + findViewById(R.id.map).setPressed(true); + context.startActivity(new Intent(context, settings.getMapFactory().getMapClass())); } - - private class cgeoFindOnMapListener implements View.OnClickListener { - - public void onClick(View arg0) { - context.startActivity(new Intent(context, settings.getMapFactory().getMapClass())); + + public void cgeoFindNearest(View v) { + if (geo == null) { + return; } - } - - private class cgeoFindByOfflineListener implements View.OnClickListener { - public void onClick(View arg0) { - final Intent cachesIntent = new Intent(context, cgeocaches.class); - cachesIntent.putExtra("type", "offline"); - context.startActivity(cachesIntent); - } + findViewById(R.id.nearest).setPressed(true); + final Intent cachesIntent = new Intent(context, cgeocaches.class); + cachesIntent.putExtra("type", "nearest"); + cachesIntent.putExtra("latitude", geo.latitudeNow); + cachesIntent.putExtra("longitude", geo.longitudeNow); + cachesIntent.putExtra("cachetype", settings.cacheType); + context.startActivity(cachesIntent); } - private class cgeoSearchListener implements View.OnClickListener { - - public void onClick(View arg0) { - context.startActivity(new Intent(context, cgeoadvsearch.class)); - } + public void cgeoFindByOffline(View v) { + findViewById(R.id.search_offline).setPressed(true); + final Intent cachesIntent = new Intent(context, cgeocaches.class); + cachesIntent.putExtra("type", "offline"); + context.startActivity(cachesIntent); } - private class cgeoPointListener implements View.OnClickListener { + public void cgeoSearch(View v) { + findViewById(R.id.advanced_button).setPressed(true); + context.startActivity(new Intent(context, cgeoadvsearch.class)); + } - public void onClick(View arg0) { - context.startActivity(new Intent(context, cgeopoint.class)); - } + public void cgeoPoint(View v) { + findViewById(R.id.any_button).setPressed(true); + context.startActivity(new Intent(context, cgeopoint.class)); + } + + public void cgeoFilter(View v) { + findViewById(R.id.filter_button).setPressed(true); + findViewById(R.id.filter_button).performClick(); } private class countBubbleUpdate extends Thread { -- cgit v1.1 From e6a8c1f917ddefb6ce8307e8f67932bf06aa113c Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 9 Sep 2011 22:59:04 +0200 Subject: Remove unused local variables --- src/cgeo/geocaching/cgeoapplication.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/cgeo/geocaching/cgeoapplication.java b/src/cgeo/geocaching/cgeoapplication.java index 36eba13..439e949 100644 --- a/src/cgeo/geocaching/cgeoapplication.java +++ b/src/cgeo/geocaching/cgeoapplication.java @@ -693,12 +693,8 @@ public class cgeoapplication extends Application { if (newItem) { // save only newly downloaded data for (cgCache cache : cacheList) { - String geocode = cache.geocode.toUpperCase(); - String guid = cache.guid.toLowerCase(); - cache.reason = reason; - - boolean status = storeWithMerge(cache, false); + storeWithMerge(cache, false); } } @@ -716,12 +712,7 @@ public class cgeoapplication extends Application { searches.put(searchId, search); } - String geocode = cache.geocode.toUpperCase(); - String guid = cache.guid.toLowerCase(); - - boolean status = false; - - status = storeWithMerge(cache, cache.reason >= 1); + final boolean status = storeWithMerge(cache, cache.reason >= 1); if (status) { search.addGeocode(cache.geocode); -- cgit v1.1 From 7a42a1ef5920820f64a08eec990e59111b4627ec Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Sat, 10 Sep 2011 09:28:08 +0200 Subject: fix: "found" marks in cache lists sometimes disappear after some seconds --- src/cgeo/geocaching/cgCacheListAdapter.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/cgeo/geocaching/cgCacheListAdapter.java b/src/cgeo/geocaching/cgCacheListAdapter.java index 968f809..cc2c211 100644 --- a/src/cgeo/geocaching/cgCacheListAdapter.java +++ b/src/cgeo/geocaching/cgCacheListAdapter.java @@ -446,10 +446,13 @@ public class cgCacheListAdapter extends ArrayAdapter { if (cache.found && cache.logOffline) { holder.logStatusMark.setImageResource(R.drawable.mark_green_red); + holder.logStatusMark.setVisibility(View.VISIBLE); } else if (cache.found) { holder.logStatusMark.setImageResource(R.drawable.mark_green); + holder.logStatusMark.setVisibility(View.VISIBLE); } else if (cache.logOffline) { holder.logStatusMark.setImageResource(R.drawable.mark_red); + holder.logStatusMark.setVisibility(View.VISIBLE); } else { holder.logStatusMark.setVisibility(View.GONE); } -- cgit v1.1