Check isFinishing when creating a Toast in some cases.

For code that may be run in the background this
is necessary to avoid a BadTokenException when
trying to display the Toast with no active window.

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 192b804493595317f8b640301d8d5787c285a9f2..647d12df21cd89d7a52c0f736336bbe1029a421b 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hughes.android.dictionary"
     android:installLocation="auto"
-    android:versionCode="99"
+    android:versionCode="100"
     android:versionName="5.4.5" >
 
     <uses-sdk

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index eb3b2a2fff0b6522722a95ba38e0e783f9903afe..8ab56277b2b6832ae274353f73d1adc8982498d2 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -784,7 +784,8 @@ public class DictionaryActivity extends ActionBarActivity {
                 Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
             }
         } catch (Exception e) {
-            Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
         }
     }
 

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 2bbe1fc8a90543e86c75aeaaaac5acca2c70b03c..69e5645333c87315bafe38e086353141310740c7 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -186,8 +186,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 }
 
                 Log.w(LOG, "Download finished: " + dest + " Id: " + downloadId);
-                Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
-                               Toast.LENGTH_LONG).show();
+                if (!isFinishing())
+                    Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
+                                   Toast.LENGTH_LONG).show();
 
                 if (unzipInstall(context, Uri.parse(dest), dest, true)) {
                     finishedDownloadIds.add(downloadId);
@@ -233,8 +234,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             zipOut = new FileOutputStream(targetFile);
             copyStream(zipFile, zipOut);
             application.backgroundUpdateDictionaries(dictionaryUpdater);
-            Toast.makeText(context, getString(R.string.installationFinished, dest),
-                           Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(context, getString(R.string.installationFinished, dest),
+                               Toast.LENGTH_LONG).show();
             result = true;
         } catch (Exception e) {
             String msg = getString(R.string.unzippingFailed, dest + ": " + e.getMessage());