X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FPreloadMapActivity.java;h=eb1230116c7cf4406486a7490d89432a95e9e09f;hb=HEAD;hp=e393b566ba9362c3017603dfbe5eada5180c4810;hpb=8b53f860eb3171cd43e4bd0e440f2889bd810662;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 e393b566..cd0ce70b 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -19,18 +19,10 @@
 package org.altusmetrum.AltosDroid;
 
 import java.util.*;
-import java.io.*;
 import java.text.*;
 
-import org.altusmetrum.AltosDroid.R;
-
 import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
@@ -40,9 +32,8 @@ import android.widget.AdapterView.*;
 import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationListener;
-import android.location.Criteria;
 
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 /**
  * This Activity appears as a dialog. It lists any paired devices and
@@ -143,8 +134,8 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 			if (selected_item != null)
 				known_sites_spinner.setSelection(known_sites_adapter.getPosition(selected_item));
 			else {
-				latitude.setText(new StringBuffer(String.format("%12.6f", current_location_site.latitude)));
-				longitude.setText(new StringBuffer(String.format("%12.6f", current_location_site.longitude)));
+				latitude.setText(new StringBuffer(String.format(Locale.getDefault(), "%12.6f", current_location_site.latitude)));
+				longitude.setText(new StringBuffer(String.format(Locale.getDefault(), "%12.6f", current_location_site.longitude)));
 			}
 		} else {
 			current_location_site.latitude = location.getLatitude();
@@ -288,8 +279,8 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	class SiteListListener implements OnItemSelectedListener {
 		public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
 			AltosLaunchSite	site = (AltosLaunchSite) parent.getItemAtPosition(pos);
-			latitude.setText(new StringBuffer(String.format("%12.6f", site.latitude)));
-			longitude.setText(new StringBuffer(String.format("%12.6f", site.longitude)));
+			latitude.setText(new StringBuffer(String.format(Locale.getDefault(), "%12.6f", site.latitude)));
+			longitude.setText(new StringBuffer(String.format(Locale.getDefault(), "%12.6f", site.longitude)));
 		}
 		public void onNothingSelected(AdapterView<?> parent) {
 		}
@@ -305,10 +296,10 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
 		super.onCreate(savedInstanceState);
 
 		// Setup the window
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		setContentView(R.layout.map_preload);
 
 		// Set result CANCELED incase the user backs out
@@ -365,8 +356,14 @@ 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 (SecurityException e) {
+			try {
+				locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000, 1, this);
+			} catch (SecurityException se) {
+			}
+		}
 
 		new AltosLaunchSites(this);
 	}