Merge branch 'develop' of https://gitlab.com/Commit451/LabCoat into develop

app/build.gradle

@@ -73,12 +73,12 @@ dependencies {
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:design:24.1.1'
-    compile 'com.android.support:recyclerview-v7:24.1.1'
-    compile 'com.android.support:cardview-v7:24.1.1'
-    compile 'com.android.support:palette-v7:24.1.1'
-    compile 'com.android.support:customtabs:24.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.android.support:design:24.2.0'
+    compile 'com.android.support:recyclerview-v7:24.2.0'
+    compile 'com.android.support:cardview-v7:24.2.0'
+    compile 'com.android.support:palette-v7:24.2.0'
+    compile 'com.android.support:customtabs:24.2.0'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
         exclude group: 'xpp3', module: 'xpp3'
@@ -91,12 +91,12 @@ dependencies {
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
     compile 'com.squareup:otto:1.3.8'
-    compile 'io.reactivex:rxjava:1.1.8'
-    compile 'com.artemzin.rxjava:proguard-rules:1.1.8.0'
+    compile 'io.reactivex:rxjava:1.1.9'
+    compile 'com.artemzin.rxjava:proguard-rules:1.1.9.0'
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.jakewharton:butterknife:8.2.1'
     apt 'com.jakewharton:butterknife-compiler:8.2.1'
-    compile 'com.jakewharton.timber:timber:4.1.2'
+    compile 'com.jakewharton.timber:timber:4.3.0'
     apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
     compile 'com.bluelinelabs:logansquare:1.3.7'
     compile 'net.danlew:android.joda:2.9.4.1'
@@ -111,7 +111,7 @@ dependencies {
     compile 'com.github.Commit451:Teleprinter:1.0.2'
     compile 'com.github.Commit451:BypassPicassoImageGetter:1.1.0'
     compile 'com.github.Commit451:Jounce:1.0.1'
-    compile 'com.github.Commit451:EasyCallback:1.0.0'
+    compile 'com.github.Commit451:EasyCallback:1.1.0'
     compile 'com.github.Commit451:ForegroundViews:2.1.0'
     compile 'com.pnikosis:materialish-progress:1.7'
     compile 'com.github.Jawnnypoo:PhysicsLayout:2.0.0'
@@ -122,11 +122,11 @@ dependencies {
     compile 'com.wdullaer:materialdatetimepicker:2.5.0'
     compile 'com.wefika:flowlayout:0.4.1'
     compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.3-rc1'
-    compile 'com.afollestad.material-dialogs:core:0.8.6.2'
-    compile 'com.afollestad.material-dialogs:commons:0.8.6.2'
+    compile 'com.afollestad.material-dialogs:core:0.9.0.1'
+    compile 'com.afollestad.material-dialogs:commons:0.9.0.1'
     compile 'de.hdodenhof:circleimageview:2.1.0'
-    normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
+    normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
         transitive = true;
     }
 }

app/src/main/java/com/commit451/gitlab/api/X509TrustManagerProvider.java

@@ -3,7 +3,9 @@ package com.commit451.gitlab.api;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
@@ -17,6 +19,7 @@ public class X509TrustManagerProvider {
     /**
      * Get the static {@link X509TrustManager} for the system
+     *
      * @return the static instance
      */
     public static X509TrustManager get() {
@@ -31,18 +34,19 @@ public class X509TrustManagerProvider {
         return sX509TrustManager;
     }
+    /**
+     * Getting the {@link X509TrustManager} as shown in the {@link okhttp3.OkHttpClient.Builder#sslSocketFactory(SSLSocketFactory, X509TrustManager)} docs
+     * @throws NoSuchAlgorithmException
+     * @throws KeyStoreException
+     */
     private static void init() throws NoSuchAlgorithmException, KeyStoreException {
-        TrustManagerFactory factory = TrustManagerFactory.getInstance("X509");
-        factory.init((KeyStore) null);
-
-        TrustManager[] trustManagers = factory.getTrustManagers();
-        if (trustManagers != null) {
-            for (TrustManager trustManager : trustManagers) {
-                if (trustManager instanceof X509TrustManager) {
-                    sX509TrustManager = (X509TrustManager) trustManager;
-                    break;
-                }
-            }
+        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustManagerFactory.init((KeyStore) null);
+        TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+        if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
+            throw new IllegalStateException("Unexpected default trust managers:"
+                    + Arrays.toString(trustManagers));
         }
+        sX509TrustManager = (X509TrustManager) trustManagers[0];
     }
 }

app/src/main/res/layout/header_nav_drawer.xml

@@ -21,7 +21,7 @@
         android:layout_height="@dimen/larger_image_size"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:layout_marginTop="@dimen/account_header_margin_top"
+        android:layout_marginTop="16dp"
         android:fitsSystemWindows="true"
         android:foreground="?attr/selectableItemBackgroundBorderless"
         tools:src="@drawable/ic_assign_24dp"/>

app/src/main/res/values-v21/dimens.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="account_header_height">173dp</dimen>
-    <dimen name="account_header_margin_top">41dp</dimen>
-</resources>
\ No newline at end of file

app/src/main/res/values-v23/dimens.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="account_header_height">172dp</dimen>
-    <dimen name="account_header_padding_top">40dp</dimen>
-</resources>
\ No newline at end of file

app/src/main/res/values/dimens.xml

@@ -18,8 +18,7 @@
     <dimen name="border_size">2dp</dimen>
     <dimen name="circle_size">72dp</dimen>
-    <dimen name="account_header_height">148dp</dimen>
-    <dimen name="account_header_margin_top">16dp</dimen>
+    <dimen name="account_header_height">172dp</dimen>
     <dimen name="user_list_image_size">180dp</dimen>
     <dimen name="user_header_image_size">300dp</dimen>