linked: redesign github resource creation, implement ouath flow

1 files changed, 3 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdWizard.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdWizard.java
index 2fb6384b2..3441bb399 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdWizard.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdWizard.java
@@ -138,16 +138,14 @@ public class LinkedIdWizard extends BaseActivity {
         super.onNewIntent(intent);
 
         Uri uri = intent.getData();
-        if (uri != null) {
-            Log.d(Constants.TAG, "received oauth uri: " + uri);
+        Log.d(Constants.TAG, "received oauth uri: " + uri);
+        if (mOAuthState != null && uri != null) {
             String state = uri.getQueryParameter("state");
             if (!mOAuthState.equalsIgnoreCase(state)) {
-                Notify.create(this, "Authentication Error!", Style.ERROR).show();
+                Notify.create(this, "OAuth State Error!", Style.ERROR).show();
                 return;
             }
             mOAuthCode = uri.getQueryParameter("code");
-        } else {
-            Log.d(Constants.TAG, "received oauth uri: null");
         }
 
     }