From ccf1cb9eca3349b1ac5ceceb745634db6549d352 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Sun, 3 Jun 2012 16:15:34 +0200 Subject: fix #1704: Filter applied to single cache request --- main/src/cgeo/geocaching/SearchActivity.java | 11 ++++++++++- main/src/cgeo/geocaching/cgeo.java | 7 +------ main/src/cgeo/geocaching/connector/gc/GCConnector.java | 4 ++-- main/src/cgeo/geocaching/connector/oc/OCApiConnector.java | 4 +--- main/src/cgeo/geocaching/connector/ox/OXConnector.java | 3 +-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java index 5d4fa47..ae350c0 100644 --- a/main/src/cgeo/geocaching/SearchActivity.java +++ b/main/src/cgeo/geocaching/SearchActivity.java @@ -11,6 +11,7 @@ import cgeo.geocaching.utils.Log; import org.apache.commons.lang3.StringUtils; +import android.app.Activity; import android.app.SearchManager; import android.content.Intent; import android.content.res.Configuration; @@ -26,7 +27,7 @@ import android.widget.EditText; public class SearchActivity extends AbstractActivity { - public static final String EXTRAS_KEYWORDSEARCH = "keywordsearch"; + private static final String EXTRAS_KEYWORDSEARCH = "keywordsearch"; private static final int MENU_SEARCH_OWN_CACHES = 1; private EditText latEdit = null; @@ -410,4 +411,12 @@ public class SearchActivity extends AbstractActivity { } return super.onOptionsItemSelected(item); } + + public static void startActivityScan(final String scan, final Activity fromActivity) { + final Intent searchIntent = new Intent(fromActivity, SearchActivity.class); + searchIntent.setAction(Intent.ACTION_SEARCH). + putExtra(SearchManager.QUERY, scan). + putExtra(SearchActivity.EXTRAS_KEYWORDSEARCH, false); + fromActivity.startActivityForResult(searchIntent, cgeo.SEARCH_REQUEST_CODE); + } } diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java index 35d0a22..1c81a63 100644 --- a/main/src/cgeo/geocaching/cgeo.java +++ b/main/src/cgeo/geocaching/cgeo.java @@ -391,12 +391,7 @@ public class cgeo extends AbstractActivity { return; } - Intent searchIntent = new Intent(this, SearchActivity.class); - searchIntent.setAction(Intent.ACTION_SEARCH). - putExtra(SearchManager.QUERY, scan). - putExtra(SearchActivity.EXTRAS_KEYWORDSEARCH, false); - startActivityForResult(searchIntent, SEARCH_REQUEST_CODE); - + SearchActivity.startActivityScan(scan, this); } else if (resultCode == RESULT_CANCELED) { // do nothing } diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java index c88f104..42ec663 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java @@ -2,7 +2,6 @@ package cgeo.geocaching.connector.gc; import cgeo.geocaching.R; import cgeo.geocaching.SearchResult; -import cgeo.geocaching.Settings; import cgeo.geocaching.cgCache; import cgeo.geocaching.cgeoapplication; import cgeo.geocaching.connector.AbstractConnector; @@ -107,7 +106,8 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode, return searchResult; } - return searchResult.filterSearchResults(false, false, Settings.getCacheType()); + // do not filter when searching for one specific cache + return searchResult; } @Override diff --git a/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java b/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java index 508aab4..17c961a 100644 --- a/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java +++ b/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java @@ -1,7 +1,6 @@ package cgeo.geocaching.connector.oc; import cgeo.geocaching.SearchResult; -import cgeo.geocaching.Settings; import cgeo.geocaching.cgCache; import cgeo.geocaching.connector.capability.ISearchByGeocode; import cgeo.geocaching.network.Parameters; @@ -33,7 +32,6 @@ public class OCApiConnector extends OCConnector implements ISearchByGeocode { if (cache == null) { return null; } - final SearchResult searchResult = new SearchResult(cache); - return searchResult.filterSearchResults(false, false, Settings.getCacheType()); + return new SearchResult(cache); } } diff --git a/main/src/cgeo/geocaching/connector/ox/OXConnector.java b/main/src/cgeo/geocaching/connector/ox/OXConnector.java index 4c53361..38bb496 100644 --- a/main/src/cgeo/geocaching/connector/ox/OXConnector.java +++ b/main/src/cgeo/geocaching/connector/ox/OXConnector.java @@ -62,7 +62,6 @@ public class OXConnector extends AbstractConnector implements ISearchByCenter, I if (caches == null) { return null; } - final SearchResult searchResult = new SearchResult(caches); - return searchResult.filterSearchResults(false, false, Settings.getCacheType()); + return new SearchResult(caches); } } -- cgit v1.1 From cb5a5b2a3afee2f09d8a9c48507f85f0053520a6 Mon Sep 17 00:00:00 2001 From: RomNexus6 Date: Mon, 4 Jun 2012 14:14:56 +0300 Subject: updated localization-it --- main/res/values-it/strings.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 8e92675..62594f2 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -359,8 +359,8 @@ Password Verifica e salva login Login - Logging in Geocaching.com… - Login ok. + Logging… + Login OK. Login fallito. Login fallito perché Connetti a Go 4 Cache @@ -430,7 +430,7 @@ Qui puoi scegliere il tuo secondo navigatore preferito. Sarà attivato tenendo premuto l\'icona di navigazione vicino al titolo della cache. Informazioni di Debug - c:geo può generare molte informazioni di debug. Per quanto queste informazioni non sono generalmente utili agli utenti di c:geo, gli sviluppatori potrebbero averne bisogno per analizzare un eventuale problema. In questo case, vi sarà chiesto di settare l\'opzione sottostante ed inviare il log. + c:geo può generare molte informazioni di debug. Per quanto queste informazioni non sono generalmente utili agli utenti di c:geo, gli sviluppatori potrebbero averne bisogno per analizzare un eventuale problema. In questo caso, vi sarà chiesto di settare l\'opzione sottostante ed inviare il log. Genera informazioni di debug Posizione Database Puoi decidere di salvare il database su memoria esterna. In questo caso risparmierai memoria interna ma potresti perdere un pochino di velocità e c:geo non funzionerà se la tua sdcard non sarà disponibile. @@ -793,6 +793,9 @@ Creazione Field Notes… GPX + + (attributo sconosciuto) permesso + (attributo sconosciuto) non permesso Cani permessi Cani NON permessi -- cgit v1.1