X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=5fdbbedbab4edded45ade82b0620fb4bbc4a8d4a;hp=8a7da5929db3c068038ef629235edb7577882023;hb=8df6e5aa67a193e12b1946ac38f2f61530bfeae5;hpb=6f17d126fb3b2f1c9af57f64a95733e33c12bfd2

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 8a7da59..5fdbbed 100644
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -7,6 +7,7 @@ import org.average.whereami.LastLocation;
 
 import android.app.Activity;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.AsyncTask;
 import android.os.Handler;
@@ -199,6 +200,14 @@ public class WhereAmI extends Activity
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.FROYO) {
+            Log.v(TAG, "Disabling keepalive for build version " +
+                       Build.VERSION.SDK_INT);
+            System.setProperty("http.keepAlive", "false");
+        } else {
+            Log.v(TAG, "Post-Froyo version " +
+                        Build.VERSION.SDK_INT);
+	}
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
         store = new PersistentStore(prefs);
         wifiman = (WifiManager)getSystemService(Context.WIFI_SERVICE);
@@ -212,9 +221,9 @@ public class WhereAmI extends Activity
         tvd = (TextView)findViewById(R.id.date);
         tvs = (TextView)findViewById(R.id.timestamp);
 	ut = new UpdateTarget[] {
-            new UpdateTarget((TextView)findViewById(R.id.location),
-                             new PhoneLog(res, store)),
             new UpdateTarget((TextView)findViewById(R.id.phonecall),
+                             new PhoneLog(res, store)),
+            new UpdateTarget((TextView)findViewById(R.id.location),
                              new LastLocation(res, store))
         };
         Log.v(TAG, "created UI, about to start update task");