diff options
| -rw-r--r-- | main/res/values/changelog_release.xml | 35 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/TrackableActivity.java | 5 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 2 |
4 files changed, 14 insertions, 34 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 6cd3c0b..587f48d 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,38 +2,9 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n - <b>2015.03.31:</b>\n - · Fix: Adaption to website changes on gc.com (login failed message on main screen)\n - · Updated translations\n - \n - \n - <b>2015.03.28:</b>\n - · Fix: Adaption to website changes on gc.com\n - · New: Distance and direction shown on map of a single cache\n - · New: Show own saved log first in logbook\n - · New: Show hint in compass and map action bar\n - · New: Sort events of same date by time (if recognized from cache description)\n - · New: Show number of trackables in cache list\n - · New: Weekday shown in event lists\n - · New: Show rudimentary details for geocaching.com.au swaggies\n - · New: Filter for caches with offline logs\n - · New: Allow export of waypoints without coords to Locus\n - · New: Confirmation on backup/restore\n - · New: Links in personal notes can be clicked\n - · New: Menu in cache details to open geo checker\n - · New: Map title shows more details\n - · Fix: Improve detection pattern for event start time\n - · Fix: Android Beam working with trackables again\n - · Fix: Disable Android Beam when not useful\n - · Fix: Don\'t allow logs in the future\n - · Fix: Allow shortcut creation for All caches list\n - · Fix: Some menus not available when invoking map from compass\n - · Fix: Do not limit to 10 logs for OC caches\n - · Fix: Recognize more hyperlinks of opencaching caches\n - · Fix: Remove empty space in some opencaching logs\n - · Fix: Allow up navigation when opening the app from a link\n - · Fix: Opening coord.info links from some mail clients was not working\n - · Removed: No longer support loading mapsforge 0.24 maps\n + <b>next bugfix release</b>\n + · Fix: wrong log count shown after logging something else than a found + · Fix: copy to clipboard not possible on Android 5.1 \n \n <b>Known Limitations/Bugs:</b>\n diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 758dc78..4f0c4d2 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1805,6 +1805,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc @Override public boolean onPrepareActionMode(final ActionMode actionMode, final Menu menu) { + return prepareClipboardActionMode(view, actionMode, menu); + } + + private boolean prepareClipboardActionMode(final View view, final ActionMode actionMode, final Menu menu) { switch (view.getId()) { case R.id.value: // coordinates, gc-code, name assert view instanceof TextView; @@ -1856,7 +1860,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc @Override public boolean onCreateActionMode(final ActionMode actionMode, final Menu menu) { actionMode.getMenuInflater().inflate(R.menu.details_context, menu); - + prepareClipboardActionMode(view, actionMode, menu); // Return true so that the action mode is shown return true; } diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java index 0b4e27a..7d10d34 100644 --- a/main/src/cgeo/geocaching/TrackableActivity.java +++ b/main/src/cgeo/geocaching/TrackableActivity.java @@ -561,6 +561,10 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi @Override public boolean onPrepareActionMode(final ActionMode actionMode, final Menu menu) { + return prepareClipboardActionMode(view, actionMode, menu); + } + + private boolean prepareClipboardActionMode(final View view, final ActionMode actionMode, final Menu menu) { final int viewId = view.getId(); assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); @@ -590,6 +594,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi @Override public boolean onCreateActionMode(final ActionMode actionMode, final Menu menu) { actionMode.getMenuInflater().inflate(R.menu.details_context, menu); + prepareClipboardActionMode(view, actionMode, menu); return true; } diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index d0a90bb..7fef8b4 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -1166,7 +1166,7 @@ public abstract class GCParser { gcLogin.getLoginStatus(page); // the log-successful-page contains still the old value if (gcLogin.getActualCachesFound() >= 0) { - gcLogin.setActualCachesFound(gcLogin.getActualCachesFound() + 1); + gcLogin.setActualCachesFound(gcLogin.getActualCachesFound() + (logType.isFoundLog() ? 1 : 0)); } final String logID = TextUtils.getMatch(page, GCConstants.PATTERN_LOG_IMAGE_UPLOAD, ""); |