Fix Intent creation.

Changing the AppID would cause them to
try to launch the original App.

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 769ce954e3c9e5ca8e014ce6dc72c5da46232dd5..410cda1b9034d25871da3ada231af07ff6df4448 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -187,11 +187,9 @@ public class DictionaryActivity extends ActionBarActivity {
     public DictionaryActivity() {
     }
 
-    public static Intent getLaunchIntent(final File dictFile, final String indexShortName,
+    public static Intent getLaunchIntent(Context c, final File dictFile, final String indexShortName,
             final String searchToken) {
-        final Intent intent = new Intent();
-        intent.setClassName(DictionaryActivity.class.getPackage().getName(),
-                DictionaryActivity.class.getName());
+        final Intent intent = new Intent(c, DictionaryActivity.class);
         intent.putExtra(C.DICT_FILE, dictFile.getPath());
         intent.putExtra(C.INDEX_SHORT_NAME, indexShortName);
         intent.putExtra(C.SEARCH_TOKEN, searchToken);
@@ -321,7 +319,7 @@ public class DictionaryActivity extends ActionBarActivity {
         if (dictFilename == null)
         {
             Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
-            startActivity(DictionaryManagerActivity.getLaunchIntent());
+            startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
             finish();
             return;
         }
@@ -354,7 +352,7 @@ public class DictionaryActivity extends ActionBarActivity {
             }
             Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
                     Toast.LENGTH_LONG).show();
-            startActivity(DictionaryManagerActivity.getLaunchIntent());
+            startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
             finish();
             return;
         }
@@ -689,7 +687,7 @@ public class DictionaryActivity extends ActionBarActivity {
         final String name = getString(R.string.dictionaryManager);
         button.setText(name);
         final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(),
-                DictionaryManagerActivity.getLaunchIntent()) {
+                DictionaryManagerActivity.getLaunchIntent(getApplicationContext())) {
             @Override
             protected void onGo() {
                 dialog.dismiss();
@@ -711,7 +709,7 @@ public class DictionaryActivity extends ActionBarActivity {
                     final View button = application.createButton(parent.getContext(),
                             dictionaryInfo, indexInfo);
                     final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
-                            getLaunchIntent(
+                            getLaunchIntent(getApplicationContext(),
                                     application.getPath(dictionaryInfo.uncompressedFilename),
                                     indexInfo.shortName, searchView.getQuery().toString())) {
                         @Override
@@ -824,7 +822,7 @@ public class DictionaryActivity extends ActionBarActivity {
             MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
             dictionaryManager.setOnMenuItemClickListener(new OnMenuItemClickListener() {
                 public boolean onMenuItemClick(final MenuItem menuItem) {
-                    startActivity(DictionaryManagerActivity.getLaunchIntent());
+                    startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
                     finish();
                     return false;
                 }
@@ -1473,7 +1471,7 @@ public class DictionaryActivity extends ActionBarActivity {
                         String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
                         // Log.d(LOG, "html=" + html);
                         startActivityForResult(
-                                HtmlDisplayActivity.getHtmlIntent(String.format(
+                                HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
                                         "<html><head></head><body>%s</body></html>", html),
                                         htmlTextToHighlight, false),
                                 0);

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 98971832183b323e6277e5ee391e6f3809e170c3..f36f43b8b21f56a7ae2a93f1990268bf525267e2 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -350,8 +350,7 @@ public class DictionaryApplication extends Application {
         MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER);
         about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
-                final Intent intent = new Intent().setClassName(AboutActivity.class
-                        .getPackage().getName(), AboutActivity.class.getCanonicalName());
+                final Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
                 context.startActivity(intent);
                 return false;
             }
@@ -361,7 +360,7 @@ public class DictionaryApplication extends Application {
         MenuItemCompat.setShowAsAction(help, MenuItem.SHOW_AS_ACTION_NEVER);
         help.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
-                context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent());
+                context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent(getApplicationContext()));
                 return false;
             }
         });
@@ -371,8 +370,7 @@ public class DictionaryApplication extends Application {
         preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
                 PreferenceActivity.prefsMightHaveChanged = true;
-                final Intent intent = new Intent().setClassName(PreferenceActivity.class
-                        .getPackage().getName(), PreferenceActivity.class.getCanonicalName());
+                final Intent intent = new Intent(getApplicationContext(), PreferenceActivity.class);
                 context.startActivity(intent);
                 return false;
             }

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 8afe62519b3f9ea4b1217462259200ea4349a27a..42a99309b815bb6f9e19cfa05b5402d0d8ac410a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -184,10 +184,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         }
     };
 
-    public static Intent getLaunchIntent() {
-        final Intent intent = new Intent();
-        intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
-                DictionaryManagerActivity.class.getName());
+    public static Intent getLaunchIntent(Context c) {
+        final Intent intent = new Intent(c, DictionaryManagerActivity.class);
         intent.putExtra(C.CAN_AUTO_LAUNCH_DICT, false);
         return intent;
     }
@@ -230,7 +228,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(
                 thanksForUpdatingLatestVersion)) {
             blockAutoLaunch = true;
-            startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent());
+            startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent(getApplicationContext()));
             prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion)
                     .commit();
         }
@@ -348,7 +346,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 prefs.contains(C.DICT_FILE) &&
                 prefs.contains(C.INDEX_SHORT_NAME)) {
             Log.d(LOG, "Skipping DictionaryManager, going straight to dictionary.");
-            startActivity(DictionaryActivity.getLaunchIntent(
+            startActivity(DictionaryActivity.getLaunchIntent(getApplicationContext(),
                     new File(prefs.getString(C.DICT_FILE, "")),
                     prefs.getString(C.INDEX_SHORT_NAME, ""),
                     prefs.getString(C.SEARCH_TOKEN, "")));
@@ -559,7 +557,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             if (canLaunch) {
                 button.setOnClickListener(
                         new IntentLauncher(buttons.getContext(),
-                                DictionaryActivity.getLaunchIntent(
+                                DictionaryActivity.getLaunchIntent(getApplicationContext(),
                                         application.getPath(dictionaryInfo.uncompressedFilename),
                                         indexInfo.shortName, "")));
 
@@ -577,7 +575,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         if (canLaunch) {
             row.setClickable(true);
             row.setOnClickListener(new IntentLauncher(parent.getContext(),
-                    DictionaryActivity.getLaunchIntent(
+                    DictionaryActivity.getLaunchIntent(getApplicationContext(),
                             application.getPath(dictionaryInfo.uncompressedFilename),
                             dictionaryInfo.indexInfos.get(0).shortName, "")));
             row.setFocusable(true);

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index 913827756891b969852e2685787d8f1809ac31b6..3107da5cb36704b42529bba86662dddc492a6586 100644 (file)
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -14,6 +14,7 @@
 \r
 package com.hughes.android.dictionary;\r
 \r
+import android.content.Context;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.support.v7.app.ActionBar;\r
@@ -34,27 +35,21 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
     static final String TEXT_TO_HIGHLIGHT = "textToHighlight";\r
     static final String SHOW_OK_BUTTON = "showOKButton";\r
 \r
-    public static Intent getHelpLaunchIntent() {\r
-        final Intent intent = new Intent();\r
-        intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(),\r
-                HtmlDisplayActivity.class.getName());\r
+    public static Intent getHelpLaunchIntent(Context c) {\r
+        final Intent intent = new Intent(c, HtmlDisplayActivity.class);\r
         intent.putExtra(HTML_RES, R.raw.help);\r
         return intent;\r
     }\r
 \r
-    public static Intent getWhatsNewLaunchIntent() {\r
-        final Intent intent = new Intent();\r
-        intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(),\r
-                HtmlDisplayActivity.class.getName());\r
+    public static Intent getWhatsNewLaunchIntent(Context c) {\r
+        final Intent intent = new Intent(c, HtmlDisplayActivity.class);\r
         intent.putExtra(HTML_RES, R.raw.whats_new);\r
         return intent;\r
     }\r
 \r
-    public static Intent getHtmlIntent(final String html, final String textToHighlight,\r
+    public static Intent getHtmlIntent(Context c, final String html, final String textToHighlight,\r
             final boolean showOkButton) {\r
-        final Intent intent = new Intent();\r
-        intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(),\r
-                HtmlDisplayActivity.class.getName());\r
+        final Intent intent = new Intent(c, HtmlDisplayActivity.class);\r
         intent.putExtra(HTML, html);\r
         intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);\r
         intent.putExtra(SHOW_OK_BUTTON, showOkButton);\r