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

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 5fdbbed..94c0139 100644
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -168,7 +168,7 @@ public class WhereAmI extends Activity
                 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);
@@ -220,17 +220,6 @@ public class WhereAmI extends Activity
         tvt = (TextView)findViewById(R.id.time);
         tvd = (TextView)findViewById(R.id.date);
         tvs = (TextView)findViewById(R.id.timestamp);
-	ut = new UpdateTarget[] {
-            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 */
@@ -250,6 +239,17 @@ public class WhereAmI extends Activity
         } else {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
+	ut = new UpdateTarget[] {
+            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 tasks");
+	mHandler.post(updateClock);
+	mHandler.post(updateCal);
+	mHandler.post(updateInfo);
+        Log.v(TAG, "created UI, update tasks created");
     }
 
     /** Called when put to background */
@@ -257,6 +257,7 @@ public class WhereAmI extends Activity
     public void onPause() {
         super.onPause();
         Log.v(TAG, "going background");
+        resetInfo.run();
     }
 
     /** Called when the activity is destroyed. */