Don't need to block multiple thread access. Refactor and update a bit for an upcoming...

[zxing.git] / android / src / com / google / zxing / client / android / HelpActivity.java

diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java
index ab0b5b2..34d80ce 100644 (file)
--- a/android/src/com/google/zxing/client/android/HelpActivity.java
+++ b/android/src/com/google/zxing/client/android/HelpActivity.java
@@ -36,6 +36,7 @@ import android.widget.Button;
  * @author dswitkin@google.com (Daniel Switkin)
  */
 public final class HelpActivity extends Activity {
+
   private static final String TAG = HelpActivity.class.getSimpleName();
 
   // Actually guessing at the Desire's MODEL for now:
@@ -53,7 +54,9 @@ public final class HelpActivity extends Activity {
   public static final String REQUESTED_PAGE_KEY = "requested_page_key";
   public static final String DEFAULT_PAGE = "index.html";
   public static final String WHATS_NEW_PAGE = "whatsnew.html";
+
   private static final String BASE_URL = "file:///android_asset/html/";
+  private static final String WEBVIEW_STATE_PRESENT = "webview_state_present";
 
   private static boolean initialized = false;
   private WebView webView;
@@ -88,8 +91,11 @@ public final class HelpActivity extends Activity {
     webView = (WebView)findViewById(R.id.help_contents);
     webView.setWebViewClient(new HelpClient());
 
+    // Froyo has a bug with calling onCreate() twice in a row, which causes the What's New page
+    // that's auto-loaded on first run to appear blank. As a workaround we only call restoreState()
+    // if a valid URL was loaded at the time the previous activity was torn down.
     Intent intent = getIntent();
-    if (icicle != null) {
+    if (icicle != null && icicle.getBoolean(WEBVIEW_STATE_PRESENT, false)) {
       webView.restoreState(icicle);
     } else if (intent != null) {
       String page = intent.getStringExtra(REQUESTED_PAGE_KEY);
@@ -102,9 +108,9 @@ public final class HelpActivity extends Activity {
       webView.loadUrl(BASE_URL + DEFAULT_PAGE);
     }
 
-    backButton = (Button)findViewById(R.id.back_button);
+    backButton = (Button) findViewById(R.id.back_button);
     backButton.setOnClickListener(backListener);
-    Button doneButton = (Button)findViewById(R.id.done_button);
+    View doneButton = findViewById(R.id.done_button);
     doneButton.setOnClickListener(doneListener);
 
     if (!initialized) {
@@ -132,7 +138,11 @@ public final class HelpActivity extends Activity {
 
   @Override
   protected void onSaveInstanceState(Bundle state) {
-    webView.saveState(state);
+    String url = webView.getUrl();
+    if (url != null && url.length() > 0) {
+      webView.saveState(state);
+      state.putBoolean(WEBVIEW_STATE_PRESENT, true);
+    }
   }
 
   @Override
@@ -152,5 +162,17 @@ public final class HelpActivity extends Activity {
       setTitle(view.getTitle());
       backButton.setEnabled(view.canGoBack());
     }
+
+    @Override
+    public boolean shouldOverrideUrlLoading(WebView view, String url) {
+      if (url.startsWith("file")) {
+        // Keep local assets in this WebView.
+        return false;
+      } else {
+        // Open external URLs in Browser.
+        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+        return true;
+      }
+    }
   }
 }