Merge pull request #47 from SChakravorti21/master

Release 1.1.0

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,6 @@
 package com.sakaimobile.development.sakaiclient20.networking.utilities;
 
-import android.util.Log;
+import android.os.Build;
 import android.webkit.CookieManager;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
@@ -9,7 +9,6 @@
 import java.io.IOException;
 
 import okhttp3.Call;
-import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -21,10 +20,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 +38,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();
@@ -68,12 +68,12 @@ public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
         // We only need to intercept once authentication is complete, as the
         // the cookies do not change afterwards
         if (url.startsWith("https://sakai.rutgers.edu/portal") && !gotHeaders)
-            return handleRequest(url);
+            return handleRequest(view, url);
 
         return super.shouldInterceptRequest(view, url);
     }
 
-    private WebResourceResponse handleRequest(String url) {
+    private WebResourceResponse handleRequest(WebView view, String url) {
         // After intercepting the request, we need to handle it
         // ourselves. This is done by creating an OkHttp3 Call,
         // which we add the Sakai cookies to. Without the cookies,
@@ -92,21 +92,53 @@ private WebResourceResponse handleRequest(String url) {
             return null;
         }
 
+        // onPageStarted is not a good place to intercept credentials because
+        // it is called too late in the release build variant. Instead, perform that
+        // operation here. Call to post() is necessary for eval to run on the UI thread.
+        view.post(() -> {
+            // 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) {
+                // We get both credentials as an array to prevent synchronization issues
+                // with getting username and password separately.
+                view.evaluateJavascript(
+                    "[document.querySelector('#username').value, document.querySelector('#password').value]",
+                    credentials -> {
+                        // JS-evaluated strings have double quotes surrounding them, necessitating
+                        // all the null and length checks, and odd substring indices.
+                        if(credentials != null && !"null".equals(credentials)
+                                && !"undefined".equals(credentials) && credentials.length() > 7) {
+                            final String separator = "\",\"";
+                            int separatorIndex = credentials.indexOf(separator);
+                            this.username = credentials.substring(2, separatorIndex);
+                            this.password = credentials.substring(separatorIndex + separator.length(), credentials.length() - 2);
+                        }
+                        // Whether we got username and password or not, the authentication was
+                        // successful and this must be indicated to the LoginActivity
+                        tryCompleteLogin(response);
+                    }
+                );
+            } else {
+                // Can't evaluate JS, just login as usual
+                tryCompleteLogin(response);
+            }
+        });
+
+        // We need to return a WebResourceResponse, otherwise the
+        // WebView will think that the request is hanging. The WebView
+        // renders this response.
+        // We do not need to modify the mimeType or encoding of the response.
+        return new WebResourceResponse(null, null, response.body().byteStream());
+    }
+
+    private void tryCompleteLogin(Response response) {
         // After getting the response from Sakai, we can get the
         // headers if it has what we want. Specifically, we need
         // the X-Sakai-Session cookie.
         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
-        // WebView will think that the request is hanging. The WebView
-        // renders this response.
-        // We do not need to modify the mimeType or encoding of the response.
-        return new WebResourceResponse(null, null,
-                response.body().byteStream()
-        );
     }
 }

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

@@ -25,7 +25,6 @@
                 @Index(value = "siteId"),
                 @Index(value = "announcementId")
         })
-// TODO: implement parcelable
 public class Announcement implements Serializable {
 
     @Ignore
@@ -44,12 +43,14 @@ public class Announcement implements Serializable {
     public String createdBy;
     public long createdOn;
 
+    @Ignore public int subjectCode;
+    @Ignore public String courseTitle;
+
     // Formatted dates are generated at runtime to be shown to the user
     // since we use relative terms like "Today"
-    @Ignore
-    private String shortFormattedDate;
-    @Ignore
-    private String longFormattedDate;
+    @Ignore private String shortFormattedDate;
+    @Ignore private String longFormattedDate;
+
 
     public Announcement(@NonNull String announcementId) {
         this.announcementId = announcementId;

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

@@ -46,18 +46,19 @@ public Single<Course> getCourse(String siteId) {
                 .map(this::flattenCompositeToEntity);
     }
 
-    public Flowable<List<List<Course>>> getCoursesSortedByTerm() {
+    public Flowable<List<Course>> getAllCourses() {
         return courseDao.getAllCourses()
-                //.firstOrError()
-                //.toObservable()
                 .debounce(300, TimeUnit.MILLISECONDS)
                 .map(courses -> {
                     List<Course> flattened = new ArrayList<>(courses.size());
                     for(CourseWithAllData course : courses)
                         flattened.add(flattenCompositeToEntity(course));
                     return flattened;
-                })
-                .map(this::sortCoursesByTerm);
+                });
+    }
+
+    public Flowable<List<List<Course>>> getCoursesSortedByTerm() {
+        return this.getAllCourses().map(this::sortCoursesByTerm);
     }
 
     public Completable refreshCourse(String siteId) {

app/src/main/java/com/sakaimobile/development/sakaiclient20/persistence/entities/Announcement.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)