Fixed reported crashes

Updated Geocaching API library to latest version
arcao · Jun 7, 2012 · e3adae9 · e3adae9
1 parent 94790f5
commit e3adae9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/.classpath b/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar" sourcepath="lib/commons-lang3-3.1-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geocaching-api-1.5.1.jar" sourcepath="lib/geocaching-api-1.5.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geocaching-api-1.5.2.jar" sourcepath="lib/geocaching-api-1.5.2-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/locus-addon-publiclib-1.6.jar" sourcepath="lib/locus-addon-publiclib-1.6-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-over-slf4j-1.6.4.jar" sourcepath="lib/log4j-over-slf4j-1.6.4-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-android-1.6.1-RC1.jar" sourcepath="lib/slf4j-android-1.6.1-RC1-sources.jar"/>

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.arcao.geocaching4locus"
-      android:versionName="1.4.1" android:versionCode="22"
+      android:versionName="1.4.1.1" android:versionCode="23"
       android:installLocation="auto">
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

diff --git a/lib/geocaching-api-1.5.1-sources.jar → lib/geocaching-api-1.5.2-sources.jar b/lib/geocaching-api-1.5.1-sources.jar → lib/geocaching-api-1.5.2-sources.jar
diff --git a/lib/geocaching-api-1.5.1.jar → lib/geocaching-api-1.5.2.jar b/lib/geocaching-api-1.5.1.jar → lib/geocaching-api-1.5.2.jar
diff --git 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);