Merge pull request #45 from SChakravorti21/session-management

Smart Lock Integration 🎉

Author: SChakravorti21

.idea/assetWizardSettings.xml

@@ -32,8 +32,8 @@ android {
         applicationId "com.sakaimobile.development.sakaiclient20"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 6
-        versionName "1.0"
+        versionCode 8
+        versionName "1.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -107,9 +107,6 @@ dependencies {
     api 'com.google.code.gson:gson:2.8.4'
     api 'com.squareup.retrofit2:converter-gson:2.3.0'
 
-    //Common-Lang3 is used for toString of POJOs
-    api 'org.apache.commons:commons-lang3:3.6'
-
     //Android TreeView library for generating tree-like structures
     api 'com.github.bmelnychuk:atv:1.2.9'
 
@@ -129,6 +126,8 @@ dependencies {
 
     // Crashlytics for crash/error reporting
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
+    // Google Play Services used for Smart Lock integration
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
 
     // LeakCanary for memory leak detection
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'

app/build.gradle

@@ -10,12 +10,12 @@
         android:name=".ui.SakaiApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".ui.activities.WebViewActivity"
+            android:name=".ui.activities.LoginActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,6 +30,8 @@
             android:screenOrientation="portrait"/>
         <activity android:name=".ui.activities.CreditsActivity"
             android:screenOrientation="portrait"/>
+        <activity android:name=".ui.activities.LoadingActivity"
+            android:screenOrientation="portrait"/>
 
         <provider
             android:name="android.support.v4.content.FileProvider"

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 import com.sakaimobile.development.sakaiclient20.ui.fragments.AllCoursesFragment;
 import com.sakaimobile.development.sakaiclient20.ui.fragments.AllGradesFragment;
 import com.sakaimobile.development.sakaiclient20.ui.fragments.AnnouncementsFragment;
+import com.sakaimobile.development.sakaiclient20.ui.activities.LoadingActivity;
 import com.sakaimobile.development.sakaiclient20.ui.fragments.SiteChatFragment;
 import com.sakaimobile.development.sakaiclient20.ui.fragments.assignments.AssignmentsFragment;
 import com.sakaimobile.development.sakaiclient20.ui.fragments.SiteGradesFragment;
@@ -28,6 +29,9 @@ abstract class SakaiApplicationModule {
     @ContributesAndroidInjector
     abstract SitePageActivity contributeSitePageActivityInjector();
 
+    @ContributesAndroidInjector
+    abstract LoadingActivity contributeLoadingActivityInjector();
+
     @ContributesAndroidInjector
     abstract AllCoursesFragment contributesFragmentInjector();
 

app/src/main/ic_launcher-web.png

@@ -7,6 +7,7 @@
 import com.sakaimobile.development.sakaiclient20.ui.viewmodels.AssignmentViewModel;
 import com.sakaimobile.development.sakaiclient20.ui.viewmodels.CourseViewModel;
 import com.sakaimobile.development.sakaiclient20.ui.viewmodels.GradeViewModel;
+import com.sakaimobile.development.sakaiclient20.ui.viewmodels.LoadingPageViewModel;
 import com.sakaimobile.development.sakaiclient20.ui.viewmodels.ResourceViewModel;
 import com.sakaimobile.development.sakaiclient20.ui.viewmodels.ViewModelFactory;
 
@@ -42,6 +43,11 @@ abstract class ViewModelModule {
     @ViewModelKey(GradeViewModel.class)
     abstract ViewModel bindGradeViewModel(GradeViewModel gradeViewModel);
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(LoadingPageViewModel.class)
+    abstract ViewModel bindLoadingPageViewModel(LoadingPageViewModel loadingPageViewModel);
+
     @Binds
     abstract ViewModelProvider.Factory bindViewModelFactory(ViewModelFactory factory);
 

app/src/main/java/com/sakaimobile/development/sakaiclient20/dependency_injection/SakaiApplicationModule.java

@@ -1,6 +1,7 @@
 package com.sakaimobile.development.sakaiclient20.networking.utilities;
 
-import android.util.Log;
+import android.graphics.Bitmap;
+import android.os.Build;
 import android.webkit.CookieManager;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
@@ -9,7 +10,6 @@
 import java.io.IOException;
 
 import okhttp3.Call;
-import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -21,10 +21,10 @@
 public class CASWebViewClient extends WebViewClient {
 
     public interface SakaiLoadedListener {
-        void onSakaiMainPageLoaded(Headers h);
+        void onLoginSuccess(String username, String password);
     }
 
-    // This listener let's our WebViewActivity know that
+    // This listener let's our LoginActivity know that
     // login was successful, and a new activity can be started
     private SakaiLoadedListener sakaiLoadedListener;
 
@@ -39,6 +39,7 @@ public interface SakaiLoadedListener {
     private OkHttpClient httpClient;
     // Keeping track of relevant headers
     private boolean gotHeaders;
+    private String username, password;
 
     public CASWebViewClient(String url, SakaiLoadedListener loadedListener) {
         super();
@@ -98,7 +99,7 @@ private WebResourceResponse handleRequest(String url) {
         String sakaiSessionHeader = response.headers().get("x-sakai-session");
         if (sakaiSessionHeader != null && !gotHeaders) {
             gotHeaders = true;
-            sakaiLoadedListener.onSakaiMainPageLoaded(null);
+            sakaiLoadedListener.onLoginSuccess(username, password);
         }
 
         // We need to return a WebResourceResponse, otherwise the
@@ -109,4 +110,25 @@ private WebResourceResponse handleRequest(String url) {
                 response.body().byteStream()
         );
     }
+
+    @Override
+    public void onPageStarted(WebView view, String url, Bitmap favicon) {
+        super.onPageStarted(view, url, favicon);
+        // It is possible that we are moving away from this page,
+        // so in case it is the login page, extract the username and password
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            // JS-evaluated strings have double quotes surrounding them, necessitating
+            // all the null and length checks
+            view.evaluateJavascript("document.querySelector('#username').value", username -> {
+                if(username != null && !"null".equals(username) && username.length() > 2) {
+                    this.username = username.substring(1, username.length() - 1);
+                }
+            });
+            view.evaluateJavascript("document.querySelector('#password').value", password -> {
+                if(password != null && !"null".equals(password) && password.length() > 2) {
+                    this.password = password.substring(1, password.length() - 1);
+                }
+            });
+        }
+    }
 }

app/src/main/java/com/sakaimobile/development/sakaiclient20/dependency_injection/ViewModelModule.java

@@ -17,7 +17,7 @@
 import com.sakaimobile.development.sakaiclient20.BuildConfig;
 import com.sakaimobile.development.sakaiclient20.dependency_injection.DaggerSakaiApplicationComponent;
 import com.sakaimobile.development.sakaiclient20.networking.services.SessionService;
-import com.sakaimobile.development.sakaiclient20.ui.activities.WebViewActivity;
+import com.sakaimobile.development.sakaiclient20.ui.activities.LoginActivity;
 import com.sakaimobile.development.sakaiclient20.ui.custom_components.DownloadCompleteReceiver;
 import com.sakaimobile.development.sakaiclient20.ui.helpers.CourseIconProvider;
 import com.squareup.leakcanary.LeakCanary;
@@ -29,7 +29,6 @@
 import dagger.android.HasActivityInjector;
 import dagger.android.support.HasSupportFragmentInjector;
 import io.fabric.sdk.android.Fabric;
-import io.reactivex.android.plugins.RxAndroidPlugins;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.plugins.RxJavaPlugins;
@@ -120,7 +119,7 @@ public void onMoveToForeground() {
 
                             // Otherwise, session has become inactive and user must be prompted
                             // to log in
-                            Intent intent = new Intent(SakaiApplication.this, WebViewActivity.class);
+                            Intent intent = new Intent(SakaiApplication.this, LoginActivity.class);
                             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
                             startActivity(intent);
                         }, Throwable::printStackTrace)

app/src/main/java/com/sakaimobile/development/sakaiclient20/networking/utilities/CASWebViewClient.java

@@ -16,7 +16,6 @@ public class CreditsActivity extends AppCompatActivity {
     private static final String[] creditsList = {
             "Rutgers Sakai",
             "Icons8",
-            "Logomakr",
             "RxAndroid",
             "AndroidTreeView",
             "Retrofit",
@@ -26,14 +25,12 @@ public class CreditsActivity extends AppCompatActivity {
     private static final String[] creditsURLs = {
             "https://sakai.rutgers.edu/direct/describe",
             "https://icons8.com/",
-            "https://logomakr.com/",
             "https://github.com/ReactiveX/RxAndroid",
             "https://github.com/bmelnychuk/AndroidTreeView",
             "https://github.com/square/retrofit",
             "https://github.com/square/okhttp"
     };
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -44,21 +41,17 @@ protected void onCreate(Bundle savedInstanceState) {
         toolbar.setNavigationOnClickListener((v) -> onBackPressed());
 
         ListView creditsListView = findViewById(R.id.credits_list_view);
-        creditsListView.setOnItemClickListener(
-                ((parent, view, position, id) -> {
-                    String url = creditsURLs[position];
-                    openURL(url);
-                })
-        );
+        creditsListView.setOnItemClickListener((parent, view, position, id) -> {
+            String url = creditsURLs[position];
+            openURL(url);
+        });
 
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.credits_item, R.id.creditNameTxt, creditsList);
         creditsListView.setAdapter(adapter);
-
     }
 
 
     private void openURL(String url) {
-
         Intent viewIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         viewIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         viewIntent.setPackage("com.android.chrome");

app/src/main/java/com/sakaimobile/development/sakaiclient20/ui/SakaiApplication.java

@@ -0,0 +1,71 @@
+package com.sakaimobile.development.sakaiclient20.ui.activities
+
+
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
+import android.content.Intent
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v7.app.AppCompatActivity
+
+import com.sakaimobile.development.sakaiclient20.R
+import com.sakaimobile.development.sakaiclient20.ui.viewmodels.LoadingPageViewModel
+import com.sakaimobile.development.sakaiclient20.ui.viewmodels.ViewModelFactory
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.activity_loading.*
+import javax.inject.Inject
+import android.view.animation.DecelerateInterpolator
+import android.animation.ObjectAnimator
+import android.widget.Toast
+
+
+/**
+ * A simple [Fragment] subclass.
+ *
+ */
+class LoadingActivity : AppCompatActivity() {
+
+    @Inject lateinit var viewModelFactory: ViewModelFactory
+    private lateinit var loadingPageViewModel: LoadingPageViewModel
+    private var hasShowedContent = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_loading)
+
+        this.loadingPageViewModel =
+                ViewModelProviders.of(this, viewModelFactory)[LoadingPageViewModel::class.java]
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // Just in case network connectivity changes as refresh is occurring,
+        // make sure the user is notified of this.
+        loadingPageViewModel.errorState.observe(this, Observer {
+            Toast.makeText(this, "We had trouble reaching Sakai, please restart this application", Toast.LENGTH_LONG).show()
+        })
+
+        loadingPageViewModel.getRefreshProgress(true).observe(this, Observer { progress ->
+            updateProgress(progress)
+            // Use hasShowedContent to prevent double-loading the next page
+            // If progress equals NUM_REFRESH_REQUESTS then we finished loading everything
+            if(progress == LoadingPageViewModel.NUM_REFRESH_REQUESTS && !hasShowedContent) {
+                hasShowedContent = true
+                val intent = Intent(this, MainActivity::class.java)
+                startActivity(intent)
+                finish()
+            }
+        })
+    }
+
+    private fun updateProgress(progress: Int?) {
+        // Create an animation for smooth update of progress bar
+        val displayProgress = progress?.times((100 / LoadingPageViewModel.NUM_REFRESH_REQUESTS)) ?: 0
+        val animation = ObjectAnimator.ofInt(progressbar, "progress", displayProgress)
+        animation.duration = 500 // 0.5 second
+        animation.interpolator = DecelerateInterpolator()
+        animation.start()
+    }
+}