diff --git a/.classpath b/.classpath
index 3df60d03..fded06ac 100644
--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,7 @@
-
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2469f6ff..711cae5f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
diff --git a/lib/geocaching-api-1.5.1-sources.jar b/lib/geocaching-api-1.5.2-sources.jar
similarity index 96%
rename from lib/geocaching-api-1.5.1-sources.jar
rename to lib/geocaching-api-1.5.2-sources.jar
index 4603790a..dc9b8e4d 100644
Binary files a/lib/geocaching-api-1.5.1-sources.jar and b/lib/geocaching-api-1.5.2-sources.jar differ
diff --git a/lib/geocaching-api-1.5.1.jar b/lib/geocaching-api-1.5.2.jar
similarity index 92%
rename from lib/geocaching-api-1.5.1.jar
rename to lib/geocaching-api-1.5.2.jar
index ee4ce501..1ed4bf63 100644
Binary files a/lib/geocaching-api-1.5.1.jar and b/lib/geocaching-api-1.5.2.jar differ
diff --git a/src/com/arcao/geocaching4locus/MainActivity.java b/src/com/arcao/geocaching4locus/MainActivity.java
index e609780a..9cbd5b44 100644
--- a/src/com/arcao/geocaching4locus/MainActivity.java
+++ b/src/com/arcao/geocaching4locus/MainActivity.java
@@ -61,18 +61,17 @@ public class MainActivity extends Activity implements LocationListener, OnIntent
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
res = getResources();
- prefs = PreferenceManager.getDefaultSharedPreferences(this);
hasCoordinates = false;
+ setContentView(R.layout.main_activity);
+
locusInstalled = true;
-
if (!LocusTesting.isLocusInstalled(this)) {
locusInstalled = false;
LocusTesting.showLocusMissingError(this);
return;
}
- setContentView(R.layout.main_activity);
if (LocusIntents.isIntentOnPointAction(getIntent())) {
Point p = LocusIntents.handleIntentOnPointAction(getIntent());
@@ -109,6 +108,8 @@ public void onFailed() {}
protected void onResume() {
super.onResume();
+ prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
IntentFilter filter = new IntentFilter(SearchGeocacheService.ACTION_PROGRESS_UPDATE);
filter.addAction(SearchGeocacheService.ACTION_PROGRESS_UPDATE);
@@ -119,6 +120,10 @@ protected void onResume() {
handler = new Handler();
+ // temporary fix for bug
+ if (findViewById(R.id.latitudeEditText) == null)
+ setContentView(R.layout.main_activity);
+
latitudeEditText = (EditText) findViewById(R.id.latitudeEditText);
longitudeEditText = (EditText) findViewById(R.id.logitudeEditText);
importCachesCheckBox = (CheckBox) findViewById(R.id.importCachesCheckBox);