some changes to qr scan logic

1 files changed, 15 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
index 8686b605f..3bc29edb6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
@@ -100,18 +100,25 @@ public class Notify {
         return createNotify(activity, activity.getString(resId), duration, style, listener, resIdAction);
     }
 
+    public static Showable createNotify(Activity activity, String msg, int duration, Style style) {
+        return createNotify(activity, msg, duration, style, null, 0);
+    }
+
     public static Showable createNotify(Activity activity, String msg, int duration, Style style,
                                         final ActionListener listener, int resIdAction) {
 
         final Snackbar bar = getSnackbar(activity)
-                .text(msg)
-                .actionLabel(resIdAction)
-                .actionListener(new ActionClickListener() {
-                    @Override
-                    public void onActionClicked(Snackbar snackbar) {
-                        listener.onAction();
-                    }
-                });
+                .text(msg);
+
+        if (listener != null) {
+            bar.actionLabel(resIdAction);
+            bar.actionListener(new ActionClickListener() {
+                @Override
+                public void onActionClicked(Snackbar snackbar) {
+                    listener.onAction();
+                }
+            });
+        }
 
         if (duration == LENGTH_INDEFINITE) {
             bar.duration(SnackbarDuration.LENGTH_INDEFINITE);