Merge pull request #3 from rjam/develop

[new] Support for default providers config

Author: rjam

oneallsdk/build.gradle

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

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

@@ -22,10 +22,14 @@
 import android.content.Intent;
 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;
 
 import io.fabric.sdk.android.Fabric;
@@ -148,6 +152,31 @@ public void setup(
             String subdomain,
             String twitterConsumerKey,
             String twitterSecret) {
+        setup(context, subdomain, null, twitterConsumerKey, twitterSecret);
+    }
+
+    /**
+     * setup manager instance. should be called before using the manager. Otherwise the manager will
+     * not function.
+     *
+     * @param context            context
+     * @param subdomain          subdomain of your OneAll application
+     * @param defaultProviders   The list of default providers used to immediately
+     *                           populate the accepted providers list while we don't get a response
+     *                           from the server (async) or cache (sync).
+     * @param twitterConsumerKey (optional) Twitter consumer key from
+     *                           {@link <a href="https://apps.twitter.com/">https://apps.twitter.com/</a>}
+     * @param twitterSecret      (optional) Twitter secret key from
+     *                           {@link <a href="https://apps.twitter.com/">https://apps.twitter.com/</a>}
+     * @throws java.lang.NullPointerException     if {@code context} is null
+     * @throws java.lang.IllegalArgumentException if {@code subdomain} is null or empty
+     */
+    public void setup(
+            Context context,
+            String subdomain,
+            @Nullable List<Provider> defaultProviders,
+            String twitterConsumerKey,
+            String twitterSecret) {
 
         if (context == null) {
             throw new NullPointerException("context cannot be null");
@@ -167,11 +196,11 @@ public void setup(
 
         // if the parent app already initialized Fabric for some of its other modules
         // make sure it includes the required TwitterCore. Otherwise, init it ourselves
-        if(!Fabric.isInitialized()) {
+        if (!Fabric.isInitialized()) {
             TwitterAuthConfig authConfig = new TwitterAuthConfig(twitterConsumerKey, twitterSecret);
             Fabric.with(this.mAppContext, new TwitterCore(authConfig));
         } else {
-            if(Fabric.getKit(TwitterCore.class) == null) {
+            if (Fabric.getKit(TwitterCore.class) == null) {
                 OALog.error("Twitter's Fabric is already init but it doesn't include TwitterCore kit which is required for Auth calls");
             } else {
                 OALog.warn("Twitter's Fabric was already init with a TwitterCore kit. Reusing existing kit");
@@ -181,6 +210,12 @@ public void setup(
         OALog.info(String.format("SDK init with subdomain %s", subdomain));
 
         Settings.getInstance().setSubdomain(subdomain);
+
+        if(defaultProviders != null) {
+            // init ProviderManager with default providers
+            ProviderManager.getInstance().updateProviders(defaultProviders);
+        }
+
         ProviderManager.getInstance().refreshProviders(mAppContext);
     }
 

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

@@ -1,10 +1,10 @@
 package com.oneall.oneallsdk;
 
-import android.content.Context;
-
 import com.oneall.oneallsdk.rest.ServiceManagerProvider;
-import com.oneall.oneallsdk.rest.models.ResponseProvidersList;
 import com.oneall.oneallsdk.rest.models.Provider;
+import com.oneall.oneallsdk.rest.models.ResponseProvidersList;
+
+import android.content.Context;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -63,6 +63,15 @@ public static ProviderManager getInstance() {
 
     // region Interface methods
 
+    /**
+     * Updates the list of providers without any additional changes.
+     *
+     * @param providers The new list of providers
+     */
+    void updateProviders(List<Provider> providers) {
+        this.providers = providers;
+    }
+
     /**
      * force providers refresh. Should be executed as early as possible during application start
      *