Backed out changeset 59ef0d1d8616 (bug 884075) for Android 2.2 robocop-2 exceptions

mobile/android/base/BrowserApp.java

@@ -395,7 +395,14 @@ abstract public class BrowserApp extends GeckoApp
 
         mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
 
-        mToast = new ButtonToast(findViewById(R.id.toast));
+        mToast = new ButtonToast(findViewById(R.id.toast), new ButtonToast.ToastListener() {
+            @Override
+            public void onButtonClicked(CharSequence token) {
+                if (ADD_SHORTCUT_TOAST.equals(token)) {
+                    showBookmarkDialog();
+                }
+            }
+        });
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
@@ -1692,15 +1699,10 @@ abstract public class BrowserApp extends GeckoApp
                     } else {
                         tab.addBookmark();
                         mToast.show(false,
-                            getResources().getString(R.string.bookmark_added),
-                            getResources().getString(R.string.bookmark_options),
-                            0,
-                            new ButtonToast.ToastListener() {
-                                @Override
-                                public void onButtonClicked() {
-                                    showBookmarkDialog();
-                                }
-                            });
+                                    getResources().getString(R.string.bookmark_added),
+                                    getResources().getString(R.string.bookmark_options),
+                                    0,
+                                    ADD_SHORTCUT_TOAST);
                         item.setIcon(R.drawable.ic_menu_bookmark_remove);
                     }
                 }

mobile/android/base/widget/ButtonToast.java

@@ -50,24 +50,23 @@ public class ButtonToast {
         public final CharSequence buttonMessage;
         public final int buttonIcon;
         public final CharSequence message;
-        public ToastListener listener;
 
-        public Toast(CharSequence aMessage, CharSequence aButtonMessage, int aIcon, ToastListener aListener) {
+        public Toast(CharSequence aMessage, CharSequence aButtonMessage, int aIcon, CharSequence aToken) {
             message = aMessage;
             buttonMessage = aButtonMessage;
             buttonIcon = aIcon;
-            listener = aListener;
-            token = "";
+            token = aToken;
         }
     }
 
     public interface ToastListener {
-        void onButtonClicked();
+        void onButtonClicked(CharSequence token);
     }
 
-    public ButtonToast(View view) {
+    public ButtonToast(View view, ToastListener listener) {
         mView = view;
-        mListener = null;
+        mListener = listener;
+
         mMessageView = (TextView) mView.findViewById(R.id.toast_message);
         mButton = (Button) mView.findViewById(R.id.toast_button);
         mButton.setOnClickListener(new View.OnClickListener() {
@@ -78,8 +77,8 @@ public class ButtonToast {
                             return;
 
                         hide(false);
-                        if (t.listener != null) {
-                            t.listener.onButtonClicked();
+                        if (mListener != null) {
+                            mListener.onButtonClicked(t.token);
                         }
                     }
                 });
@@ -89,8 +88,8 @@ public class ButtonToast {
 
     public void show(boolean immediate, CharSequence message,
                      CharSequence buttonMessage, int buttonIcon,
-                     ToastListener listener) {
-        Toast t = new Toast(message, buttonMessage, buttonIcon, listener);
+                     CharSequence token) {
+        Toast t = new Toast(message, buttonMessage, buttonIcon, token);
         show(t, immediate);
     }