[upd] improved clean up on web login activity and replaced deprecated ActionBarActivity by AppCompatActivity;

[upd] OAManager now checks if any Fabric instance is already available before attempting to init it. Fabric includes lots of kits which may already be in use by the main application so we need to check before trying to init a potentially already init singleton. If TwitterCore kit is present we go with it, if not we crash with an informative log so the dev knows how to fix it.

Author: Ricardo Moutinho

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

@@ -15,6 +15,7 @@ class OALog {
     // region Constants
 
     private final static String TAG = "oneall";
+//    private final static boolean PRINT_LOGS = true;
     private final static boolean PRINT_LOGS = BuildConfig.DEBUG;
 
     // endregion

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

@@ -156,8 +156,18 @@ public void setup(
 
         OALog.init(mAppContext);
 
-        TwitterAuthConfig authConfig = new TwitterAuthConfig(twitterConsumerKey, twitterSecret);
-        Fabric.with(this.mAppContext, new TwitterCore(authConfig));
+        // 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()) {
+            TwitterAuthConfig authConfig = new TwitterAuthConfig(twitterConsumerKey, twitterSecret);
+            Fabric.with(this.mAppContext, new TwitterCore(authConfig));
+        } else {
+            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");
+            }
+        }
 
         OALog.info(String.format("SDK init with subdomain %s", subdomain));
 

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

@@ -8,7 +8,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.WindowManager;
 import android.webkit.WebView;
@@ -17,11 +17,12 @@
 /**
  * Web view activity used to take the user through authentication
  */
-public class WebLoginActivity extends ActionBarActivity {
+public class WebLoginActivity extends AppCompatActivity {
 
     // region Properties
 
     private ProgressDialog progressDialog;
+    private WebView mWebView;
 
     // endregion
 
@@ -45,9 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        WebView webView = (WebView) findViewById(R.id.web_login_web_view);
-        webView.getSettings().setJavaScriptEnabled(true);
-        webView.setWebViewClient(new WebViewClient() {
+        mWebView = (WebView) findViewById(R.id.web_login_web_view);
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.setWebViewClient(new WebViewClient() {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -56,7 +57,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
 
             @Override
             public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                OALog.info(String.format("Page loading state: %s", url));
+                OALog.info(String.format("Page loading started: %s", url));
                 try {
                     if (progressDialog == null) {
                         progressDialog = ProgressDialog.show(
@@ -91,7 +92,7 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
                 pageLoadFailed(failingUrl);
             }
         });
-        webView.loadUrl(getIntent().getExtras().getString(INTENT_EXTRA_URL));
+        mWebView.loadUrl(getIntent().getExtras().getString(INTENT_EXTRA_URL));
     }
 
     @Override
@@ -101,6 +102,11 @@ protected void onDestroy() {
             progressDialog.dismiss();
         }
 
+        if (mWebView != null) {
+            mWebView.stopLoading();
+            mWebView.destroy();
+        }
+
         super.onDestroy();
     }