pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android][kindle] Closed #648 - crash with WiFiLocation

Browse source
This commit is contained in:
Alex Zolotarev 2012-02-26 14:16:34 +03:00 • committed by Alex Zolotarev
parent 9fb6f2f370
commit 955506022d
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/src/com/mapswithme/maps/location/WifiLocation.java
View file

@ -1,15 +1,12 @@
package com.mapswithme.maps.location;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
import org.json.JSONException;
import org.json.JSONObject;
import android.content.BroadcastReceiver;
@ -46,8 +43,17 @@ public class WifiLocation extends BroadcastReceiver
{
m_wifi = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
c.registerReceiver(this, new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION));
return m_wifi.startScan();
if (m_wifi.startScan())
return true;
else
{
// onReceive() will never be called on fail
c.unregisterReceiver(this);
m_wifi = null;
return false;
}
}
// Already in progress
return true;
}
@ -123,18 +129,13 @@ public class WifiLocation extends BroadcastReceiver
wr.close();
rd.close();
} catch (MalformedURLException e)
{
e.printStackTrace();
} catch (IOException e)
{
e.printStackTrace();
} catch (JSONException e)
}
catch (Exception e)
{
e.printStackTrace();
}
if (m_observer != null)
if (m_observer != null && location != null)
m_observer.onWifiLocationUpdated(location);
m_wifi = null;
}