Merge pull request #16 from toshi3221/fix/login_on_android

Fix some login error on android

Author: santiagofm

android/src/main/java/com/xmartlabs/lineloginmanager/LineLogin.java

@@ -27,28 +27,30 @@ public class LineLogin extends ReactContextBaseJavaModule {
 
     private LineApiClient lineApiClient;
     private Promise currentPromise;
-    private LineLoginResult loginResult;
     private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
         @Override
         public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
             super.onActivityResult(activity, requestCode, resultCode, data);
             if (currentPromise != null) {
+                final Promise promise = currentPromise;
+                currentPromise = null;
                 if (requestCode != REQUEST_CODE) {
-                    currentPromise.reject(ERROR, "Unsupported request");
+                    promise.reject(ERROR, "Unsupported request");
                     return;
                 }
-                loginResult = LineLoginApi.getLoginResultFromIntent(data);
+                final LineLoginResult loginResult = LineLoginApi.getLoginResultFromIntent(data);
                 switch (loginResult.getResponseCode()) {
                     case SUCCESS:
-                        currentPromise.resolve(parseLoginResult(loginResult));
+                        promise.resolve(parseLoginResult(loginResult));
                         break;
                     case CANCEL:
-                        loginResult = null;
-                        currentPromise.reject(ERROR, "Line login canceled by user");
+                        promise.reject(ERROR, "Line login canceled by user");
+                        break;
+                    case AUTHENTICATION_AGENT_ERROR:
+                        promise.reject(ERROR, "The user has denied the approval");
                         break;
                     default:
-                        loginResult = null;
-                        currentPromise.reject(ERROR, loginResult.getErrorData().toString());
+                        promise.reject(ERROR, loginResult.getErrorData().toString());
                         break;
                 }
             }
@@ -143,10 +145,14 @@ protected LineApiResponse doInBackground(Void... voids) {
 
         @Override
         protected void onPostExecute(LineApiResponse lineApiResponse) {
-            if (lineApiResponse.isSuccess()) {
-                currentPromise.resolve(new Object());
-            } else {
-                currentPromise.reject(ERROR, lineApiResponse.getErrorData().toString());
+            if (currentPromise != null) {
+                final Promise promise = currentPromise;
+                currentPromise = null;
+                if (lineApiResponse.isSuccess()) {
+                    promise.resolve(null);
+                } else {
+                    promise.reject(ERROR, lineApiResponse.getErrorData().toString());
+                }
             }
         }
     }
@@ -157,10 +163,14 @@ protected LineApiResponse<LineProfile> doInBackground(Void... params) {
         }
 
         protected void onPostExecute(LineApiResponse<LineProfile> lineApiResponse) {
-            if (lineApiResponse.isSuccess()) {
-                currentPromise.resolve(parseProfile(lineApiResponse.getResponseData()));
-            } else {
-                currentPromise.reject(ERROR, lineApiResponse.getErrorData().toString());
+            if (currentPromise != null) {
+                final Promise promise = currentPromise;
+                currentPromise = null;
+                if (lineApiResponse.isSuccess()) {
+                    promise.resolve(parseProfile(lineApiResponse.getResponseData()));
+                } else {
+                    promise.reject(ERROR, lineApiResponse.getErrorData().toString());
+                }
             }
         }
     }
@@ -172,10 +182,14 @@ protected LineApiResponse<LineAccessToken> doInBackground(Void... params) {
 
         @Override
         protected void onPostExecute(LineApiResponse<LineAccessToken> lineApiResponse) {
-            if (lineApiResponse.isSuccess()) {
-                currentPromise.resolve(parseAccessToken(lineApiResponse.getResponseData()));
-            } else {
-                currentPromise.reject(ERROR, lineApiResponse.getErrorData().toString());
+            if (currentPromise != null) {
+                final Promise promise = currentPromise;
+                currentPromise = null;
+                if (lineApiResponse.isSuccess()) {
+                    promise.resolve(parseAccessToken(lineApiResponse.getResponseData()));
+                } else {
+                    promise.reject(ERROR, lineApiResponse.getErrorData().toString());
+                }
             }
         }
     }