Code refactoring, and improvements

juniordamacena · juniordamacena · commit 6f3f26062134 · 2017-07-24T14:16:57.000-03:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Mon Jul 24 11:45:01 BRT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/oauthLibGithub/build.gradle b/oauthLibGithub/build.gradle
@@ -12,7 +12,7 @@ ext {
     siteUrl = 'https://github.com/geniushkg/github-oauth/'
     gitUrl = 'https://github.com/geniushkg/github-oauth.git'
 
-    libraryVersion = '1.0.2'
+    libraryVersion = '1.1.0'
     developerId = 'geniushkg'
     developerName = 'Hardik Goswami'
     developerEmail = 'geniushkg@gmail.com'
@@ -24,13 +24,13 @@ ext {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "$libraryVersion"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/oauthLibGithub/src/main/java/com/hardikgoswami/oauthLibGithub/GithubOauth.java b/oauthLibGithub/src/main/java/com/hardikgoswami/oauthLibGithub/GithubOauth.java
@@ -14,6 +14,7 @@ public class GithubOauth {
     private boolean debug;
     private String packageName;
     private ArrayList<String> scopeList;
+    private boolean clearBeforeLauch;
 
     public boolean isDebug() {
         return debug;
@@ -24,7 +25,7 @@ public ArrayList<String> getScopeList() {
     }
 
     public void setScopeList(ArrayList<String> scopeList) {
-        this.scopeList = new ArrayList<String>();
+        this.scopeList = new ArrayList<>();
         this.scopeList = scopeList;
     }
 
@@ -75,11 +76,22 @@ public GithubOauth packageName(String packageName) {
         return this;
     }
 
-    public GithubOauth withScopeList(ArrayList<String> scopeList){
+    public GithubOauth withScopeList(ArrayList<String> scopeList) {
         setScopeList(scopeList);
         return this;
     }
 
+    /**
+     * Whether the app should clear all data (cookies and cache) before launching a new instance of
+     * the webView
+     *
+     * @param clearBeforeLauch true to clear data
+     * @return An instance of this class
+     */
+    public GithubOauth clearDataBeforeLauch(boolean clearBeforeLauch) {
+        this.clearBeforeLauch = clearBeforeLauch;
+        return this;
+    }
 
     public void setClient_id(String client_id) {
         this.client_id = client_id;
@@ -122,24 +134,22 @@ public void execute() {
         ArrayList<String> scopeList = getScopeList();
         String github_id = getClient_id();
         String github_secret = getClient_secret();
-        String activityName = getNextActivity();
-        Intent intent = new Intent(appContext, OauthActivity.class);
+        Intent intent = new Intent(getAppContext(), OauthActivity.class);
         intent.putExtra("id", github_id);
         intent.putExtra("secret", github_secret);
-        intent.putExtra("debug", debug);
-        intent.putExtra("package", packageName);
-        intent.putExtra("activity", nextActivity);
-        if (scopeList != null) {
-            if (scopeList.size()>0){
-                intent.putStringArrayListExtra("scope_list",scopeList);
-                intent.putExtra("isScopeDefined",true);
-            } else {
-                intent.putExtra("isScopeDefined",false);
-            }
-        } else {
-            intent.putExtra("isScopeDefined",false);
+        intent.putExtra("debug", isDebug());
+        intent.putExtra("package", getPackageName());
+        intent.putExtra("activity", getNextActivity());
+        intent.putExtra("clearData", clearBeforeLauch);
+
+        boolean hasScope = scopeList != null && scopeList.size() > 0;
+
+        if (hasScope) {
+            intent.putStringArrayListExtra("scope_list", scopeList);
         }
 
+        intent.putExtra("isScopeDefined", hasScope);
+
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         appContext.startActivity(intent);
     }
diff --git a/oauthLibGithub/src/main/java/com/hardikgoswami/oauthLibGithub/OauthActivity.java b/oauthLibGithub/src/main/java/com/hardikgoswami/oauthLibGithub/OauthActivity.java
@@ -2,20 +2,17 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.View;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import okhttp3.Call;
@@ -31,51 +28,54 @@ public class OauthActivity extends AppCompatActivity {
     public static final String GITHUB_OAUTH = "https://github.com/login/oauth/access_token";
     private static final String TAG = "github-oauth";
     public static String CODE = "";
+    public static String PACKAGE = "";
     public static String CLIENT_ID = "";
     public static String CLIENT_SECRET = "";
     public static String ACTIVITY_NAME = "";
-    public static String PACKAGE = "";
-    private ProgressBar spinner;
+    public String scopeAppendToUrl = "";
     private WebView webview;
     private Class c;
-    private boolean isScopeDefined;
-    private boolean debug;
+    private boolean clearDataBeforeLaunch = false;
+    private boolean isScopeDefined = false;
+    private boolean debug = false;
     public List<String> scopeList;
-    public String scopeAppendToUrl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_oauth);
+
         scopeList = new ArrayList<>();
+        scopeAppendToUrl = "";
+
         if (getIntent().getExtras() != null) {
             CLIENT_ID = getIntent().getStringExtra("id");
+            PACKAGE = getIntent().getStringExtra("package");
             CLIENT_SECRET = getIntent().getStringExtra("secret");
             ACTIVITY_NAME = getIntent().getStringExtra("activity");
             debug = getIntent().getBooleanExtra("debug", false);
-            PACKAGE = getIntent().getStringExtra("package");
             isScopeDefined = getIntent().getBooleanExtra("isScopeDefined", false);
-            if (isScopeDefined) {
-                scopeList = getIntent().getStringArrayListExtra("scope_list");
-            }
+            clearDataBeforeLaunch = getIntent().getBooleanExtra("clearData", false);
         } else {
             Log.d(TAG, "intent extras null");
+            finish();
         }
-        if (debug)
-            Log.d(TAG, "intent recieved is -client id :" + CLIENT_ID + "-secret:" + CLIENT_SECRET + "-activit : " + ACTIVITY_NAME + "-Package : " + PACKAGE);
-//        try {
-//            c = Class.forName(ACTIVITY_NAME);
-//        } catch (ClassNotFoundException exp) {
-//            if (debug)Log.d(TAG, "error :" + exp.getMessage());
-//        }
-        spinner = (ProgressBar) findViewById(R.id.progressBar);
-        spinner.setVisibility(View.VISIBLE);
+
+        String url_load = GITHUB_URL + "?client_id=" + CLIENT_ID;
+
         if (isScopeDefined) {
+            scopeList = getIntent().getStringArrayListExtra("scope_list");
             scopeAppendToUrl = getCsvFromList(scopeList);
-        } else {
-            scopeAppendToUrl = "";
+            url_load += "&scope=" + scopeAppendToUrl;
         }
-        Log.d(TAG, "onCreate: Scope request are : " + scopeAppendToUrl);
+
+        if (debug) {
+            Log.d(TAG, "intent received is -client id :" + CLIENT_ID + "-secret:" + CLIENT_SECRET + "-activity : " + ACTIVITY_NAME + "-Package : " + PACKAGE);
+            Log.d(TAG, "onCreate: Scope request are : " + scopeAppendToUrl);
+        }
+
+        // TODO: 7/24/2017 Clear the cache and cookies of the webView if clearDataBeforeLaunch is true
+        
         webview = (WebView) findViewById(R.id.webview);
         webview.getSettings().setJavaScriptEnabled(true);
         webview.setWebViewClient(new WebViewClient() {
@@ -92,16 +92,13 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                     String[] cleanToken = tokenFetchedIs.split("&");
                     if (debug) Log.d(TAG, "token cleaned is :" + cleanToken[0]);
                     fetchOauthTokenWithCode(cleanToken[0]);
-                } catch (NullPointerException | ArrayIndexOutOfBoundsException e) {}
+                } catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
+                    e.printStackTrace();
+                }
                 return false;
             }
         });
-        String url_load = "";
-        if (isScopeDefined) {
-            url_load = GITHUB_URL + "?client_id=" + CLIENT_ID + "&scope=" + scopeAppendToUrl;
-        } else {
-            url_load = GITHUB_URL + "?client_id=" + CLIENT_ID;
-        }
+        
         webview.loadUrl(url_load);
     }
 
@@ -124,22 +121,35 @@ public void onFailure(Call call, IOException e) {
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
+
                 if (response.isSuccessful()) {
                     String JsonData = response.body().string();
-                    if (debug) Log.d(TAG, "response is:" + JsonData);
+
+                    if (debug) {
+                        Log.d(TAG, "response is:" + JsonData);
+                    }
+
                     try {
                         JSONObject jsonObject = new JSONObject(JsonData);
                         String auth_token = jsonObject.getString("access_token");
-                        if (debug) Log.d(TAG, "token is :" + auth_token);
+
                         storeToSharedPreference(auth_token);
+
+                        if (debug) {
+                            Log.d(TAG, "token is :" + auth_token);
+                        }
+
                     } catch (JSONException exp) {
-                        if (debug) Log.d(TAG, "json exception :" + exp.getMessage());
+                        if (debug) {
+                            Log.d(TAG, "json exception :" + exp.getMessage());
+                        }
                     }
 
                 } else {
-                    Log.d(TAG, "onResponse: not success : " + response.message());
+                    if (debug) {
+                        Log.d(TAG, "onResponse: not success : " + response.message());
+                    }
                 }
-
             }
         });
     }
@@ -157,22 +167,35 @@ public void onBackPressed() {
     private void storeToSharedPreference(String auth_token) {
         SharedPreferences prefs = getSharedPreferences("github_prefs", MODE_PRIVATE);
         SharedPreferences.Editor edit = prefs.edit();
+
         edit.putString("oauth_token", auth_token);
-        edit.commit();
+        edit.apply();
+
+        // TODO: 7/24/2017 Only open a new activity if specified
         Intent intent = new Intent();
         intent.setClassName(PACKAGE, ACTIVITY_NAME);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
+
         finish();
     }
 
+    /**
+     * Generate a comma separated list of scopes out of the
+     *
+     * @param scopeList list of scopes as defined
+     * @return comma separated list of scopes
+     */
     public String getCsvFromList(List<String> scopeList) {
         String csvString = "";
 
-        for (int i = 0; i < scopeList.size() - 1; i++) {
-            csvString = csvString + scopeList.get(i) + ",";
+        for (String scope : scopeList) {
+            if (!csvString.equals("")) {
+                csvString += ",";
+            }
+            
+            csvString += scope;
         }
-        csvString = csvString + scopeList.get(scopeList.size() - 1);
 
         return csvString;
     }
diff --git a/oauthLibGithub/src/main/res/layout/activity_oauth.xml b/oauthLibGithub/src/main/res/layout/activity_oauth.xml
@@ -7,14 +7,6 @@
     android:orientation="vertical"
     tools:context="com.hardikgoswami.oauthLibGithub.OauthActivity">
 
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:visibility="gone"/>
-
     <WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.2.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.3.3'`
`9`	`9`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'`
`10`	`10`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`