X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FPreloadMapActivity.java;h=eb1230116c7cf4406486a7490d89432a95e9e09f;hb=07fa6611080cc7a4ae2815e9867afde5be7a3f89;hp=e6fd07fa84a2f1a24db0b511135197e82e51ce62;hpb=a4fc7db3bc82d4a2222bcfc0cd33b298bc5d3430;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index e6fd07fa..eb123011 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -33,7 +33,7 @@ import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationListener;
 
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 /**
  * This Activity appears as a dialog. It lists any paired devices and
@@ -300,7 +300,6 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		super.onCreate(savedInstanceState);
 
 		// Setup the window
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		setContentView(R.layout.map_preload);
 
 		// Set result CANCELED incase the user backs out
@@ -357,8 +356,11 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 		// Listen for GPS and Network position updates
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
-
-		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 1, this);
+		try {
+			locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 1, this);
+		} catch (Exception e) {
+			locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000, 1, this);
+		}
 
 		new AltosLaunchSites(this);
 	}