Trying to fix pre-lolipop svg drawable loading.

CHANGELOG.md

@@ -1,3 +1,23 @@
+**1.5.2.06**
+
+- Fix problem introduced in 1.5.2.04. SVG file not working on older versions of android.
+
+**1.5.2.05**
+
+- Versions updates
+
+**1.5.2.04**
+
+- Reverted to the old icon.
+
+- Better icon for the intro activity.
+
+- Updated gradle version.
+
+**1.5.2.03**
+
+- Added the ability to accept self signed certificates. (Needs more testing)
+
 **1.5.2.02**
 
 - Added optional login option.

app/build.gradle

@@ -95,25 +95,25 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
     // Android Support
-    compile 'com.android.support:appcompat-v7:26.0.0'
-    compile 'com.android.support:design:26.0.0'
-    compile 'com.android.support:recyclerview-v7:26.0.0'
-    compile 'com.android.support:support-v4:26.0.0'
-    compile 'com.android.support:support-vector-drawable:26.0.0'
-    compile 'com.android.support:customtabs:26.0.0'
-    compile 'com.android.support:cardview-v7:26.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:design:26.0.1'
+    compile 'com.android.support:recyclerview-v7:26.0.1'
+    compile 'com.android.support:support-v4:26.0.1'
+    compile 'com.android.support:support-vector-drawable:26.0.1'
+    compile 'com.android.support:customtabs:26.0.1'
+    compile 'com.android.support:cardview-v7:26.0.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
     // Firebase + crashlytics
-    compile 'com.google.firebase:firebase-core:11.0.2'
-    compile 'com.google.firebase:firebase-config:11.0.2'
-    compile 'com.google.firebase:firebase-invites:11.0.2'
+    compile 'com.google.firebase:firebase-core:11.2.0'
+    compile 'com.google.firebase:firebase-config:11.2.0'
+    compile 'com.google.firebase:firebase-invites:11.2.0'
     compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true
     }
 
     //multidex
-    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:multidex:1.0.2'
 
     // Intro
     compile 'agency.tango.android:material-intro-screen:0.0.5'
@@ -143,10 +143,10 @@ dependencies {
     compile 'com.github.stkent:amplify:1.5.0'
 
     // For the article reader
-    compile 'com.klinkerapps:drag-dismiss-activity:1.4.2'
+    compile 'com.klinkerapps:drag-dismiss-activity:1.4.3'
 
     // Drawer
-    compile('com.mikepenz:materialdrawer:5.9.4@aar') {
+    compile('com.mikepenz:materialdrawer:5.9.5@aar') {
         transitive = true
     }
     compile 'com.anupcowkur:reservoir:3.1.0'

app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt

@@ -2,6 +2,7 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Intent
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.support.constraint.ConstraintLayout
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
@@ -43,7 +44,8 @@ class AddSourceActivity : AppCompatActivity() {
         var api: SelfossApi? = null
 
         try {
-            api = SelfossApi(this, this@AddSourceActivity)
+            val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+            api = SelfossApi(this, this@AddSourceActivity, prefs.getBoolean("isSelfSignedCert", false))
         } catch (e: IllegalArgumentException) {
             mustLoginToAddSource()
         }

app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt

@@ -139,7 +139,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         customTabActivityHelper = CustomTabActivityHelper()
 
-        api = SelfossApi(this, this@HomeActivity)
+        val dirtyPref = PreferenceManager.getDefaultSharedPreferences(this)
+        api = SelfossApi(this, this@HomeActivity, dirtyPref.getBoolean("isSelfSignedCert", false))
         items = ArrayList()
 
         appColors =  AppColors(this@HomeActivity)

app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt

@@ -9,7 +9,7 @@ import android.view.View
 import agency.tango.materialintroscreen.MaterialIntroActivity
 import agency.tango.materialintroscreen.MessageButtonBehaviour
 import agency.tango.materialintroscreen.SlideFragmentBuilder
-
+import android.support.v7.app.AppCompatDelegate
 
 
 class IntroActivity : MaterialIntroActivity() {
@@ -17,10 +17,12 @@ class IntroActivity : MaterialIntroActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+
         addSlide(SlideFragmentBuilder()
             .backgroundColor(R.color.colorPrimary)
             .buttonsColor(R.color.colorAccent)
-            .image(R.mipmap.ic_launcher)
+            .image(R.drawable.web_hi_res_512)
             .title(getString(R.string.intro_hello_title))
             .description(getString(R.string.intro_hello_message))
             .build())
@@ -28,7 +30,7 @@ class IntroActivity : MaterialIntroActivity() {
         addSlide(SlideFragmentBuilder()
             .backgroundColor(R.color.colorAccent)
             .buttonsColor(R.color.colorPrimary)
-            .image(R.drawable.ic_info_outline_white_48dp)
+            .image(R.drawable.ic_info_outline_white_48px)
             .title(getString(R.string.intro_needs_selfoss_title))
             .description(getString(R.string.intro_needs_selfoss_message))
             .build(),
@@ -40,7 +42,7 @@ class IntroActivity : MaterialIntroActivity() {
         addSlide(SlideFragmentBuilder()
             .backgroundColor(R.color.colorPrimaryDark)
             .buttonsColor(R.color.colorAccentDark)
-            .image(R.drawable.ic_thumb_up_white_48dp)
+            .image(R.drawable.ic_thumb_up_white_48px)
             .title(getString(R.string.intro_all_set_title))
             .description(getString(R.string.intro_all_set_message))
             .build())

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -37,6 +37,7 @@ import io.fabric.sdk.android.Fabric
 class LoginActivity : AppCompatActivity() {
 
     private var inValidCount: Int = 0
+    private var isWithSelfSignedCert = false
     private var isWithLogin = false
     private var isWithHTTPLogin = false
 
@@ -101,6 +102,15 @@ class LoginActivity : AppCompatActivity() {
         val mPasswordLayout: TextInputLayout = findViewById(R.id.passwordLayout)
         val mHTTPPasswordLayout: TextInputLayout = findViewById(R.id.httpPasswordInput)
         val mEmailSignInButton: Button = findViewById(R.id.email_sign_in_button)
+        val selfHostedSwitch: Switch = findViewById(R.id.withSelfhostedCert)
+        val warningTextview: TextView = findViewById(R.id.warningText)
+
+        selfHostedSwitch.setOnCheckedChangeListener {_, b ->
+            isWithSelfSignedCert = !isWithSelfSignedCert
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            warningTextview.visibility = visi
+        }
 
         mPasswordView.setOnEditorActionListener(TextView.OnEditorActionListener { _, id, _ ->
             if (id == R.id.login || id == EditorInfo.IME_NULL) {
@@ -196,9 +206,10 @@ class LoginActivity : AppCompatActivity() {
             editor.putString("httpUserName", httpLogin)
             editor.putString("password", password)
             editor.putString("httpPassword", httpPassword)
+            editor.putBoolean("isSelfSignedCert", isWithSelfSignedCert)
             editor.apply()
 
-            val api = SelfossApi(this, this@LoginActivity)
+            val api = SelfossApi(this, this@LoginActivity, isWithSelfSignedCert)
             api.login().enqueue(object : Callback<SuccessResponse> {
                 private fun preferenceError(t: Throwable) {
                     editor.remove("url")

app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt

@@ -2,6 +2,7 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Intent
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@@ -36,7 +37,10 @@ class SourcesActivity : AppCompatActivity() {
         val mFab: FloatingActionButton = findViewById(R.id.fab)
         val mRecyclerView: RecyclerView = findViewById(R.id.activity_sources)
         val mLayoutManager = LinearLayoutManager(this)
-        val api = SelfossApi(this, this@SourcesActivity)
+
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+
+        val api = SelfossApi(this, this@SourcesActivity, prefs.getBoolean("isSelfSignedCert", false))
         var items: ArrayList<Sources> = ArrayList()
 
         mFab.attachToRecyclerView(mRecyclerView)

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt

@@ -23,26 +23,66 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 import apps.amine.bou.readerforselfoss.utils.Config
+import java.security.cert.CertificateException
+import java.security.cert.X509Certificate
+import javax.net.ssl.*
 
 
 // codebeat:disable[ARITY,TOO_MANY_FUNCTIONS]
-class SelfossApi(c: Context, callingActivity: Activity) {
+class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Boolean) {
 
     private lateinit var service: SelfossService
     private val config: Config = Config(c)
     private val userName: String
     private val password: String
 
+    fun OkHttpClient.Builder.maybeWithSelfSigned(isWithSelfSignedCert: Boolean): OkHttpClient.Builder =
+        if (isWithSelfSignedCert) {
+            try {
+                // Create a trust manager that does not validate certificate chains
+                val trustAllCerts = arrayOf<TrustManager>(object : X509TrustManager {
+                    override fun getAcceptedIssuers(): Array<X509Certificate> =
+                        arrayOf()
+
+                    @Throws(CertificateException::class)
+                    override fun checkClientTrusted(chain: Array<java.security.cert.X509Certificate>, authType: String) {
+                    }
+
+                    @Throws(CertificateException::class)
+                    override fun checkServerTrusted(chain: Array<java.security.cert.X509Certificate>, authType: String) {
+                    }
+
+                })
+
+                // Install the all-trusting trust manager
+                val sslContext = SSLContext.getInstance("SSL")
+                sslContext.init(null, trustAllCerts, java.security.SecureRandom())
+
+                val sslSocketFactory = sslContext.socketFactory
+
+                OkHttpClient.Builder()
+                    .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
+                    .hostnameVerifier { _, _ -> true }
+
+            } catch (e: Exception) {
+                throw RuntimeException(e)
+            }
+
+        } else {
+            this
+        }
+
     fun Credentials.createAuthenticator(): DispatchingAuthenticator =
         DispatchingAuthenticator.Builder()
             .with("digest", DigestAuthenticator(this))
             .with("basic", BasicAuthenticator(this))
             .build()
 
-    fun DispatchingAuthenticator.getHttpClien(): OkHttpClient {
+    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient {
         val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
         return OkHttpClient
             .Builder()
+            .maybeWithSelfSigned(isWithSelfSignedCert)
             .authenticator(CachingAuthenticatorDecorator(this, authCache))
             .addInterceptor(AuthenticationCacheInterceptor(authCache))
             .build()
@@ -71,7 +111,7 @@ class SelfossApi(c: Context, callingActivity: Activity) {
                 Retrofit
                     .Builder()
                     .baseUrl(config.baseUrl)
-                    .client(authenticator.getHttpClien())
+                    .client(authenticator.getHttpClien(isWithSelfSignedCert))
                     .addConverterFactory(GsonConverterFactory.create(gson))
                     .build()
             service = retrofit.create(SelfossService::class.java)

app/src/main/res/drawable/ic_info_outline_white_48px.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>

app/src/main/res/drawable/ic_thumb_up_white_48px.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
+</vector>

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

@@ -138,6 +138,20 @@
                         android:hint="@string/prompt_http_password" />
                 </android.support.design.widget.TextInputLayout>
 
+                <Switch
+                    android:id="@+id/withSelfhostedCert"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/self_hosted_cert_switch" />
+
+                <TextView
+                    android:id="@+id/warningText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/self_signed_cert_warning"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:visibility="gone" />
+
                 <Button
                     android:id="@+id/email_sign_in_button"
                     style="?android:textAppearanceSmall"

app/src/main/res/values-fr/strings.xml

@@ -136,4 +136,6 @@
     <string name="login_debug_on">Toutes les erreurs de connexion vont être loguées</string>
     <string name="login_debug_off">Aucune erreur de connexion ne sera loguée</string>
     <string name="login_menu_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Certificat auto-signé ?</string>
+    <string name="self_signed_cert_warning">Pour des raisons de sécurités, les certificats auto-signés sont désactivés par défaut. En les activant, je ne serais pas responsable de quelconques problèmes de sécurité rencontrés.</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -136,4 +136,6 @@
     <string name="login_debug_on">Any error on the login page will be logged</string>
     <string name="login_debug_off">No log on the login page</string>
     <string name="login_menu_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
 </resources>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#26B29F</color>
+  <color name="ic_launcher_background">#FFFFFF</color>
 </resources>

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

@@ -138,4 +138,6 @@
     <string name="login_debug_on">Any error on the login page will be logged</string>
     <string name="login_debug_off">No log on the login page</string>
     <string name="login_menu_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
 </resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jul 02 08:13:37 CEST 2017
+#Wed Aug 16 19:45:22 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip