Merge pull request #4 from rjam/develop

[1.1.1] safety checks and minor refactor

Author: rjam

oneallsdk/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 6
-        versionName "1.1"
+        versionCode 7
+        versionName "1.1.1"
     }
     buildTypes {
         release {

oneallsdk/src/main/java/com/oneall/oneallsdk/OAManager.java

@@ -23,11 +23,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.WindowManager;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
@@ -258,12 +256,13 @@ public Boolean login(final Activity activity, String provider, LoginHandler hand
         validateInitialization();
 
         loginHandler = handler;
-        selectedProvider = ProviderManager.getInstance().findByKey(provider);
+        Provider loginProvider = ProviderManager.getInstance().findByKey(provider);
 
-        if (selectedProvider == null) {
-            throw new IllegalArgumentException("Specified provider does not exist");
+        if (loginProvider == null) {
+            throw new IllegalArgumentException("Specified provider does not exist: " + provider);
         }
 
+        selectedProvider = loginProvider;
         lastNonce = UUID.randomUUID().toString();
 
         switch (provider) {
@@ -284,7 +283,7 @@ public void failure(OAError error) {
                                 });
 
                 if (!res) {
-                    webLoginWithProvider(activity);
+                    webLoginWithProvider(activity, loginProvider);
                 }
                 break;
             case "twitter":
@@ -301,7 +300,7 @@ public void failure(OAError error) {
                 });
                 break;
             default:
-                webLoginWithProvider(activity);
+                webLoginWithProvider(activity, loginProvider);
                 break;
         }
 
@@ -505,10 +504,10 @@ private void webLoginComplete(Intent data) {
      *
      * @param userInput user information if required by this provider, can be null
      */
-    private void webLoginWithLoginData(Activity activity, String userInput) {
-        String url = getApiUrlForProvider(selectedProvider, lastNonce, userInput);
+    private void webLoginWithLoginData(Activity activity, Provider provider, String userInput) {
+        String url = getApiUrlForProvider(provider, lastNonce, userInput);
         OALog.info(String.format(
-                "Web login with provider %s and url: %s", selectedProvider.getKey(), url));
+                "Web login with provider %s and url: %s", provider.getKey(), url));
         Intent i = new Intent(activity, WebLoginActivity.class);
         i.putExtra(WebLoginActivity.INTENT_EXTRA_URL, url);
         i.putExtra(WebLoginActivity.INTENT_EXTRA_LOADING_STRING, loading);
@@ -520,10 +519,10 @@ private void webLoginWithLoginData(Activity activity, String userInput) {
      * starts actual web login with selected provider by opening web view with provider relevant
      * URL
      */
-    private void webLoginWithProvider(Activity activity) {
-        OALog.info(String.format("Login with provider %s", selectedProvider));
+    private void webLoginWithProvider(Activity activity, final Provider provider) {
+        OALog.info(String.format("Login with provider %s", provider));
 
-        if (selectedProvider.getAuthentication().getIsUserInputRequired()) {
+        if (provider.getAuthentication().getIsUserInputRequired()) {
             FragmentManager fm = activity.getFragmentManager();
             final UserInputDialog dialog = new UserInputDialog();
             dialog.setListener(new UserInputDialog.DialogListener() {
@@ -532,18 +531,18 @@ public void onCancel() { }
 
                 @Override
                 public void onAccept(String userInput) {
-                    webLoginWithLoginData(dialog.getActivity(), userInput);
+                    webLoginWithLoginData(dialog.getActivity(), provider, userInput);
                 }
             });
 
             Bundle args = new Bundle();
-            args.putString(UserInputDialog.ARGUMENT_USER_INPUT_TYPE, selectedProvider.getAuthentication().getUserInputType());
-            args.putString(UserInputDialog.ARGUMENT_PROVIDER_NAME, selectedProvider.getName());
+            args.putString(UserInputDialog.ARGUMENT_USER_INPUT_TYPE, provider.getAuthentication().getUserInputType());
+            args.putString(UserInputDialog.ARGUMENT_PROVIDER_NAME, provider.getName());
 
             dialog.setArguments(args);
             dialog.show(fm, "user_input_dialog");
         } else {
-            webLoginWithLoginData(activity, null);
+            webLoginWithLoginData(activity, provider, null);
         }
     }
 

oneallsdk/src/main/java/com/oneall/oneallsdk/ProviderManager.java

@@ -88,9 +88,13 @@ public void success(ResponseProvidersList responseProvidersList, Response respon
                         .getProviders()
                         .getEntries();
 
-                cacheProviders(context, pps);
-                providers = pps;
-                OALog.info(String.format("Parsed %d providers from server", pps.size()));
+                if(pps != null) {
+                    cacheProviders(context, pps);
+                    providers = pps;
+                    OALog.info(String.format("Parsed %d providers from server", pps.size()));
+                } else {
+                    OALog.error("Failed to parse providers from server: got null");
+                }
             }
 
             @Override
@@ -177,9 +181,10 @@ private void loadCachedProviders(Context context) {
         try {
             fis = context.openFileInput(PROVIDERS_CACHE_FILE);
             is = new ObjectInputStream(fis);
-            providers = (Collection<Provider>) is.readObject();
+            Collection<Provider> tmp = (Collection<Provider>) is.readObject();
 
-            if (providers != null) {
+            if (tmp != null && !tmp.isEmpty()) {
+                providers = tmp;
                 OALog.info(String.format("Loaded %d cached providers", providers.size()));
             }
         } catch (FileNotFoundException ignored) {