X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=9731e099c75d717d95e9d496f0114850b09b8e29;hp=1002b3aadb0fc7d6d3aa7c5ca110b89cf7e7e90f;hb=36b6777a469a0ab1a15016b2d34b9e2aa10a3c0a;hpb=816e15ad1c9de478be113a53a51b483791503c30

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 1002b3a..9731e09 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;
@@ -65,7 +66,7 @@ public class WhereAmI extends Activity
                     Time tm = new Time();
                     tm.setToNow();
                     tvs.setText(R.string.lasttry);
-                    tvs.append(tm.format(" %d/%m/%Y %H:%M:%S"));
+                    tvs.append(tm.format(" %d/%m/%Y %H:%M"));
                 }
             }
 
@@ -164,10 +165,11 @@ public class WhereAmI extends Activity
                 for (int i = 0; i < ut.length; i++) {
                     ut[i].cancel();
                 }
+                runningtasks = 0;
                 Time tm = new Time();
                 tm.setToNow();
                 tvs.setText(R.string.failtry);
-                tvs.append(tm.format(" %d/%m/%Y %H:%M:%S"));
+                tvs.append(tm.format(" %d/%m/%Y %H:%M"));
             }
             if (managewifi) {
                 boolean wifion = wifiman.setWifiEnabled(false);
@@ -199,6 +201,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,16 +222,11 @@ 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");
-	mHandler.post(updateClock);
-	mHandler.post(updateCal);
-	mHandler.post(updateInfo);
-        Log.v(TAG, "created UI, update task created");
     }
 
     /** Called when reactivated */
@@ -241,6 +246,10 @@ public class WhereAmI extends Activity
         } else {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
+	mHandler.post(updateClock);
+	mHandler.post(updateCal);
+	mHandler.post(updateInfo);
+        Log.v(TAG, "update tasks scheduled");
     }
 
     /** Called when put to background */
@@ -248,6 +257,10 @@ public class WhereAmI extends Activity
     public void onPause() {
         super.onPause();
         Log.v(TAG, "going background");
+        resetInfo.run();
+	mHandler.removeCallbacks(updateClock);
+	mHandler.removeCallbacks(updateCal);
+	mHandler.removeCallbacks(updateInfo);
     }
 
     /** Called when the activity is destroyed. */
@@ -255,17 +268,6 @@ public class WhereAmI extends Activity
     public void onDestroy() {
         super.onDestroy();
         Log.v(TAG, "going down");
-	mHandler.removeCallbacks(updateClock);
-	mHandler.removeCallbacks(updateCal);
-	mHandler.removeCallbacks(updateInfo);
-        if (connChangedRegistered) {
-            unregisterReceiver(connChanged);
-            connChangedRegistered = false;
-        }
-        if (managewifi) {
-            boolean wifion = wifiman.setWifiEnabled(false);
-            Log.v(TAG, "disabling wifi result " + wifion);
-        }
     }
 
     /** Called when the menu is activated. */