Solved compilation warning.

.github/CONTRIBUTING.md

@@ -46,12 +46,30 @@ You can directly import this project into IntellIJ/Android Studio.
 
 You'll have to:
 
-- Configure Fabric, or [remove it](https://docs.fabric.io/android/fabric/settings/removing.html#).
+- Configure fabric and add your `apiKey` and `apiSecret` in the `fabric.properties` file.
 - Create a firebase project and add the `google-services.json` to the `app/` folder.
-- Define the following in `res/values/strings.xml` or create `res/values/secrets.xml`
+- Define the following some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
 
-    - mercury: A [Mercury](https://mercury.postlight.com/web-parser/) web parser api key for the internal browser
-    - feedback_email: An email to receive users  feedback.
-    - source_url: an url to the source code, used in the settings
-    - tracker_url: an url to the tracker, used in the settings
-- To run your app, you'll have to add `-P appLoginUrl="your.selfoss-instance.url" -P appLoginUsername="Username" -P appLoginPassword="password"`. (These are only used to run the espresso tests. You should be able to use empty strings or fake values to build the app)
+    - mercuryApiKey: A [Mercury](https://mercury.postlight.com/web-parser/) web parser api key for the internal browser
+    - feedbackEmail: An email to receive users  feedback.
+    - sourceUrl: an url to the source code, used in the settings
+    - trackerUrl: an url to the tracker, used in the settings
+
+### Examples:
+#### Inside ~/.gradle/gradle.properties
+
+```
+appLoginUrl="URL"
+appLoginUsername="LOGIN"
+appLoginPassword="PASS"
+mercuryApiKey="LONGAPIKEY"
+feedbackEmail="EMAIL"
+sourceUrl="URLSOURCE"
+trackerUrl="URLTRACKER"
+```
+
+#### As gradle parameters
+
+```
+./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS" -P mercuryApiKey="LONGAPIKEY" -P feedbackEmail="EMAIL" -P sourceUrl="URLSOURCE" -P trackerUrl="URLTRACKER"
+```

.gitignore

@@ -214,6 +214,4 @@ gradle-app.setting
 
 # End of https://www.gitignore.io/api/java,gradle,android,androidstudio
 
-secrets.xml
-
 release/

CHANGELOG.md

@@ -1,3 +1,23 @@
+**1.5.2.17**
+
+- Source code and tracker links weren't being set, and updated the contributing doc.
+
+**1.5.2.15/16**
+
+- Adding an account header on the lateral drawer.
+
+- The account header is only displayed when the setting is enabled.
+
+**1.5.2.13/14**
+
+- Updated glide.
+
+- Loading images from self signed certificate now working.
+
+**1.5.2.12**
+
+- Self signed certificates are now working for loading data. Image are not loading yet.
+
 **1.5.2.11**
 
 - Added a random unique identifier to be used in the logs.

app/build.gradle

@@ -35,7 +35,7 @@ repositories {
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
@@ -53,10 +53,16 @@ android {
 
         // tests
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+        buildConfigField "String", "MERCURY_KEY", mercuryApiKey
+        buildConfigField "String", "FEEDBACK_EMAIL", feedbackEmail
+        buildConfigField "String", "SOURCE_URL", sourceUrl
+        buildConfigField "String", "TRACKER_URL", trackerUrl
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
@@ -83,12 +89,12 @@ android {
 
 dependencies {
     // Testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0'
+    androidTestCompile 'com.android.support.test:runner:1.0.0'
     // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.0'
     // Espresso-intents for validation and stubbing of Intents
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.0'
 
 
     compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -119,7 +125,7 @@ dependencies {
     compile 'agency.tango.android:material-intro-screen:0.0.5'
 
     // About
-    compile('com.mikepenz:aboutlibraries:5.9.6@aar') {
+    compile('com.mikepenz:aboutlibraries:5.9.7@aar') {
         transitive = true
     }
 
@@ -137,7 +143,10 @@ dependencies {
     compile 'org.sufficientlysecure:html-textview:3.3'
 
     // glide
-    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile('com.github.bumptech.glide:glide:4.1.0@aar') {
+        transitive = true;
+    }
+    compile('com.github.bumptech.glide:okhttp3-integration:4.1.0@aar')
 
     // Asking politely users to rate the app
     compile 'com.github.stkent:amplify:1.5.0'
@@ -162,6 +171,7 @@ apply plugin: 'com.google.gms.google-services'
 afterEvaluate {
     initFabricPropertiesIfNeeded()
     initAppLoginPropertiesIfNeeded()
+    initAppForSecretPropertiesIfNeeded()
 }
 
 def initFabricPropertiesIfNeeded() {
@@ -186,3 +196,16 @@ def initAppLoginPropertiesIfNeeded() {
         }
     }
 }
+
+def initAppForSecretPropertiesIfNeeded() {
+    def propertiesFile = file(System.getProperty("user.home") + '/.gradle/gradle.properties')
+    if (!propertiesFile.exists()) {
+        def commentMessage = "This is autogenerated local property from system environment to prevent key to be committed to source control."
+        ant.propertyfile(file: System.getProperty("user.home") + "/.gradle/gradle.properties", comment: commentMessage) {
+            entry(key: "mercuryApiKey", value: System.getProperty("mercuryApiKey"))
+            entry(key: "feedbackEmail", value: System.getProperty("feedbackEmail"))
+            entry(key: "sourceUrl", value: System.getProperty("sourceUrl"))
+            entry(key: "trackerUrl", value: System.getProperty("trackerUrl"))
+        }
+    }
+}

app/proguard-rules.pro

@@ -56,4 +56,12 @@
 
 
 #Bottom bar lib
--dontwarn com.roughike.bottombar.**
+-dontwarn com.roughike.bottombar.**
+
+
+# self signed glidemodule
+-keep public class * implements com.bumptech.glide.module.GlideModule
+
+-dontwarn com.anupcowkur.reservoir.**
+
+-dontwarn javax.annotation.**

app/src/main/AndroidManifest.xml

@@ -64,6 +64,9 @@
         <activity android:name=".ReaderActivity"
             android:theme="@style/DragDismissTheme">
         </activity>
+        <meta-data
+            android:name="apps.amine.bou.readerforselfoss.utils.glide.SelfSignedGlideModule"
+            android:value="GlideModule" />
     </application>
 
 </manifest>

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

@@ -64,6 +64,9 @@ import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.ftinc.scoop.Scoop
+import com.mikepenz.materialdrawer.AccountHeader
+import com.mikepenz.materialdrawer.AccountHeaderBuilder
+import com.mikepenz.materialdrawer.model.ProfileDrawerItem
 
 
 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
@@ -93,6 +96,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var maybeSourceFilter: Sources? = null
     private var maybeSearchFilter: String? = null
     private var userIdentifier: String = ""
+    private var displayAccountHeader: Boolean = false
 
     private lateinit var emptyText: TextView
     private lateinit var recyclerView: RecyclerView
@@ -142,7 +146,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         customTabActivityHelper = CustomTabActivityHelper()
 
-        val dirtyPref = PreferenceManager.getDefaultSharedPreferences(this)
+        val dirtyPref = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         api = SelfossApi(this, this@HomeActivity, dirtyPref.getBoolean("isSelfSignedCert", false))
         items = ArrayList()
 
@@ -150,7 +154,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         handleBottomBar()
 
-        handleDrawer()
+        handleDrawer(dirtyPref)
 
         coordinatorLayout = findViewById(R.id.coordLayout)
         swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout)
@@ -289,52 +293,56 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         fullHeightCards = sharedPref.getBoolean("full_height_cards", false)
         itemsNumber = sharedPref.getString("prefer_api_items_number", "200").toInt()
         userIdentifier = sharedPref.getString("unique_id", "")
+        displayAccountHeader = sharedPref.getBoolean("account_header_displaying", false)
     }
 
-    private fun handleDrawer() {
-
-        drawer = DrawerBuilder()
-            .withActivity(this)
-            .withRootView(R.id.drawer_layout)
-            .withToolbar(toolbar)
-            .withActionBarDrawerToggle(true)
-            .withActionBarDrawerToggleAnimated(true)
-            .withShowDrawerOnFirstLaunch(true)
-            .withOnDrawerListener(object: Drawer.OnDrawerListener {
-                override fun onDrawerSlide(v: View?, p1: Float) {
-                    bottomBar.alpha = (1 - p1)
-                }
-
-                override fun onDrawerClosed(v: View?) {
-                    bottomBar.show()
-                }
-
-                override fun onDrawerOpened(v: View?) {
-                    bottomBar.hide()
-                }
-
-            })
-            .build()
-
-        drawer.addStickyFooterItem(
-            PrimaryDrawerItem()
-                .withName(R.string.action_about)
-                .withSelectable(false)
-                .withIcon(R.drawable.ic_info_outline)
-                .withIconTintingEnabled(true)
-                .withOnDrawerItemClickListener { _, _, _ ->
-                    LibsBuilder()
-                        .withActivityStyle(
-                            if (appColors.isDarkTheme)
-                                Libs.ActivityStyle.LIGHT_DARK_TOOLBAR
-                            else
-                                Libs.ActivityStyle.DARK
+    private fun handleDrawer(dirtyPref: SharedPreferences) {
+        displayAccountHeader =
+            PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean("account_header_displaying", false)
+        val headerResult: AccountHeader? = if (displayAccountHeader) {
+            AccountHeaderBuilder()
+                .withActivity(this)
+                .withHeaderBackground(R.drawable.bg)
+                .addProfiles(
+                    ProfileDrawerItem()
+                        .withName(
+                            dirtyPref.getString("url", "")
                         )
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .start(this@HomeActivity)
-                    false
+                        .withIcon(resources.getDrawable(R.mipmap.ic_launcher))
+                )
+                .withSelectionListEnabledForSingleProfile(false)
+                .build()
+        } else null
+
+        val drawerBuilder =
+            DrawerBuilder()
+                .withActivity(this)
+                .withRootView(R.id.drawer_layout)
+                .withToolbar(toolbar)
+                .withActionBarDrawerToggle(true)
+                .withActionBarDrawerToggleAnimated(true)
+                .withShowDrawerOnFirstLaunch(true)
+                .withOnDrawerListener(object: Drawer.OnDrawerListener {
+                    override fun onDrawerSlide(v: View?, p1: Float) {
+                        bottomBar.alpha = (1 - p1)
+                    }
+
+                    override fun onDrawerClosed(v: View?) {
+                        bottomBar.show()
+                    }
+
+                    override fun onDrawerOpened(v: View?) {
+                        bottomBar.hide()
+                    }
+
                 })
+
+        if (displayAccountHeader && headerResult != null)
+            drawerBuilder.withAccountHeader(headerResult)
+
+        drawer = drawerBuilder.build()
+
         drawer.addStickyFooterItem(
             PrimaryDrawerItem()
                 .withName(R.string.title_activity_settings)
@@ -438,6 +446,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         .withIdentifier(DRAWER_ID_TAGS)
                         .withSelectable(false))
                 handleTags(maybeDrawerData.tags)
+                drawer.addItem(DividerDrawerItem())
                 drawer.addItem(
                     SecondaryDrawerItem()
                         .withName(getString(R.string.drawer_item_sources))
@@ -450,6 +459,26 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         }
                 )
                 handleSources(maybeDrawerData.sources)
+                drawer.addItem(DividerDrawerItem())
+                drawer.addItem(
+                    PrimaryDrawerItem()
+                        .withName(R.string.action_about)
+                        .withSelectable(false)
+                        .withIcon(R.drawable.ic_info_outline)
+                        .withIconTintingEnabled(true)
+                        .withOnDrawerItemClickListener { _, _, _ ->
+                            LibsBuilder()
+                                .withActivityStyle(
+                                    if (appColors.isDarkTheme)
+                                        Libs.ActivityStyle.LIGHT_DARK_TOOLBAR
+                                    else
+                                        Libs.ActivityStyle.DARK
+                                )
+                                .withAboutIconShown(true)
+                                .withAboutVersionShown(true)
+                                .start(this@HomeActivity)
+                            false
+                        })
 
 
                 if (!loadedFromCache)

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

@@ -9,6 +9,7 @@ import android.widget.ImageView
 import apps.amine.bou.readerforselfoss.utils.Config
 import com.anupcowkur.reservoir.Reservoir
 import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import com.crashlytics.android.Crashlytics
 import com.ftinc.scoop.Scoop
 import com.github.stkent.amplify.tracking.Amplify
@@ -48,7 +49,7 @@ class MyApp : MultiDexApplication() {
 
     private fun initAmplify() {
         Amplify.initSharedInstance(this)
-            .setFeedbackEmailAddress(getString(R.string.feedback_email))
+            .setFeedbackEmailAddress(BuildConfig.FEEDBACK_EMAIL)
             .applyAllDefaultRules()
     }
 
@@ -63,11 +64,15 @@ class MyApp : MultiDexApplication() {
     private fun initDrawerImageLoader() {
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
             override fun set(imageView: ImageView?, uri: Uri?, placeholder: Drawable?, tag: String?) {
-                Glide.with(imageView?.context).load(uri).placeholder(placeholder).into(imageView)
+                Glide.with(imageView?.context)
+                    .load(uri)
+                    .apply(RequestOptions.fitCenterTransform()
+                        .placeholder(placeholder))
+                    .into(imageView)
             }
 
             override fun cancel(imageView: ImageView?) {
-                Glide.clear(imageView)
+                Glide.with(imageView?.context).clear(imageView)
             }
 
             override fun placeholder(ctx: Context?, tag: String?): Drawable {

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

@@ -24,6 +24,7 @@ import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
+import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
 
 
@@ -50,7 +51,7 @@ class ReaderActivity : DragDismissActivity() {
         val title: TextView = v.findViewById(R.id.title)
         val content: HtmlTextView = v.findViewById(R.id.content)
         val url = intent.getStringExtra("url")
-        val parser = MercuryApi(getString(R.string.mercury))
+        val parser = MercuryApi(BuildConfig.MERCURY_KEY)
         val browserBtn: ImageButton = v.findViewById(R.id.browserBtn)
         val shareBtn: ImageButton = v.findViewById(R.id.shareBtn)
 
@@ -75,9 +76,9 @@ class ReaderActivity : DragDismissActivity() {
                     if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isEmpty())
                         Glide
                             .with(baseContext)
-                            .load(response.body()!!.lead_image_url)
                             .asBitmap()
-                            .fitCenter()
+                            .load(response.body()!!.lead_image_url)
+                            .apply(RequestOptions.fitCenterTransform())
                             .into(image)
 
                     shareBtn.setOnClickListener {

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt

@@ -32,6 +32,9 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.*
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
+import apps.amine.bou.readerforselfoss.utils.glide.bitmapFitCenter
+import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import com.crashlytics.android.Crashlytics
 import kotlin.collections.ArrayList
 
@@ -63,7 +66,7 @@ class ItemCardAdapter(private val app: Activity,
         holder.sourceTitleAndDate.text = itm.sourceAndDateText()
 
         if (itm.getThumbnail(c).isEmpty()) {
-            Glide.clear(holder.itemImage)
+            Glide.with(c).clear(holder.itemImage)
             holder.itemImage.setImageDrawable(null)
         } else {
             if (fullHeightCards) {

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt

@@ -29,6 +29,8 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.*
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
+import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import com.crashlytics.android.Crashlytics
 import kotlin.collections.ArrayList
 

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt

@@ -21,7 +21,7 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.utils.circularBitmapDrawable
+import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 
 

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

@@ -2,11 +2,6 @@ package apps.amine.bou.readerforselfoss.api.selfoss
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.support.v7.app.AlertDialog
-import android.widget.Toast
-import apps.amine.bou.readerforselfoss.LoginActivity
-import apps.amine.bou.readerforselfoss.R
 import java.util.concurrent.ConcurrentHashMap
 
 import com.burgstaller.okhttp.AuthenticationCacheInterceptor
@@ -23,9 +18,7 @@ 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.*
+import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
 
 
 // codebeat:disable[ARITY,TOO_MANY_FUNCTIONS]
@@ -38,36 +31,7 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
 
     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)
-            }
-
+            getUnsafeHttpClient()
         } else {
             this
         }

app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java

@@ -27,6 +27,7 @@ import android.widget.Toast;
 
 import java.util.List;
 
+import apps.amine.bou.readerforselfoss.BuildConfig;
 import apps.amine.bou.readerforselfoss.R;
 import apps.amine.bou.readerforselfoss.utils.Config;
 import com.ftinc.scoop.ui.ScoopSettingsActivity;
@@ -242,7 +243,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             findPreference( "trackerLink" ).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    openUrl(Uri.parse(getString(R.string.tracker_url)));
+                    openUrl(Uri.parse(BuildConfig.TRACKER_URL));
                     return true;
                 }
             });
@@ -250,7 +251,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             findPreference("sourceLink").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    openUrl(Uri.parse(getString(R.string.source_url)));
+                    openUrl(Uri.parse(BuildConfig.SOURCE_URL));
                     return false;
                 }
             });

app/src/main/java/apps/amine/bou/readerforselfoss/utils/GlideUtils.kt

@@ -1,24 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
-import android.widget.ImageView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.BitmapImageViewTarget
-
-
-fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
-    Glide.with(this).load(url).asBitmap().centerCrop().into(iv)
-
-fun Context.bitmapFitCenter(url: String, iv: ImageView) =
-    Glide.with(this).load(url).asBitmap().fitCenter().into(iv)
-
-fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
-    Glide.with(this).load(url).asBitmap().centerCrop().into(object : BitmapImageViewTarget(iv) {
-        override fun setResource(resource: Bitmap) {
-            val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, resource)
-            circularBitmapDrawable.isCircular = true
-            iv.setImageDrawable(circularBitmapDrawable)
-        }
-    })

app/src/main/java/apps/amine/bou/readerforselfoss/utils/HttpUtils.kt

@@ -0,0 +1,39 @@
+package apps.amine.bou.readerforselfoss.utils
+
+import okhttp3.OkHttpClient
+import java.security.cert.CertificateException
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+fun getUnsafeHttpClient() =
+    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)
+    }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt

@@ -0,0 +1,29 @@
+package apps.amine.bou.readerforselfoss.utils.glide
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.BitmapImageViewTarget
+
+
+fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
+    Glide.with(this).asBitmap().load(url).apply(RequestOptions.centerCropTransform()).into(iv)
+
+fun Context.bitmapFitCenter(url: String, iv: ImageView) =
+    Glide.with(this).asBitmap().load(url).apply(RequestOptions.fitCenterTransform()).into(iv)
+
+fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
+    Glide.with(this)
+        .asBitmap()
+        .load(url)
+        .apply(RequestOptions.centerCropTransform()).
+        into(object : BitmapImageViewTarget(iv) {
+            override fun setResource(resource: Bitmap?) {
+                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, resource)
+                circularBitmapDrawable.isCircular = true
+                iv.setImageDrawable(circularBitmapDrawable)
+            }
+        })

app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/SelfSignedGlideModule.kt

@@ -0,0 +1,32 @@
+package apps.amine.bou.readerforselfoss.utils.glide
+
+import android.content.Context
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
+import com.bumptech.glide.Glide
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.Registry
+import com.bumptech.glide.module.GlideModule
+import com.bumptech.glide.load.model.GlideUrl
+import java.io.InputStream
+
+
+class SelfSignedGlideModule : GlideModule {
+
+    override fun applyOptions(context: Context?, builder: GlideBuilder?) {}
+
+    override fun registerComponents(context: Context?, glide: Glide?, registry: Registry?) {
+
+        if (context != null) {
+            val pref = context?.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            if (pref.getBoolean("isSelfSignedCert", false)) {
+                val client = getUnsafeHttpClient().build()
+
+                registry?.append(GlideUrl::class.java, InputStream::class.java,
+                    com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader.Factory(client))
+            }
+
+        }
+    }
+
+}

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

@@ -145,4 +145,6 @@
     <string name="read_debug_off">Aucun log quand un article est marqué comme lu</string>
     <string name="summary_debug_identifier">Identifiant de debug</string>
     <string name="unique_id_to_clipboard">Texte  copié</string>
+    <string name="display_header_drawer_summary">Afficher une entête avec l\'url de votre instance de Selfoss en haut du drawer lateral.</string>
+    <string name="display_header_drawer_title">Entête de compte</string>
 </resources>

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

@@ -145,4 +145,7 @@
     <string name="read_debug_off">No log when marking an item as read</string>
     <string name="summary_debug_identifier">Debug identifier</string>
     <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string
+        name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
 </resources>

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

@@ -147,4 +147,7 @@
     <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
     <string name="summary_debug_identifier">Debug identifier</string>
     <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string
+        name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
 </resources>

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

@@ -13,6 +13,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarDark" parent="MaterialDrawerTheme">
@@ -25,12 +26,14 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <!-- ToolBar -->
     <style name="ToolBarStyle" parent="Theme.AppCompat">
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorSecondary">@color/white</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
         <item name="actionMenuTextColor">@color/white</item>
         <!--<item name="actionOverflowButtonStyle">@style/ActionButtonOverflowStyle</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>-->
@@ -46,6 +49,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarBlueAmberDark" parent="MaterialDrawerTheme">
@@ -58,6 +62,7 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarGreyOrange" parent="MaterialDrawerTheme.Light">
@@ -69,6 +74,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarGreyOrangeDark" parent="MaterialDrawerTheme">
@@ -81,6 +87,7 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarIndigoPink" parent="MaterialDrawerTheme.Light">
@@ -92,6 +99,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarIndigoPinkDark" parent="MaterialDrawerTheme">
@@ -104,6 +112,7 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarRedTeal" parent="MaterialDrawerTheme.Light">
@@ -115,6 +124,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarRedTealDark" parent="MaterialDrawerTheme">
@@ -127,6 +137,7 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarCyanPink" parent="MaterialDrawerTheme.Light">
@@ -138,6 +149,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarCyanPinkDark" parent="MaterialDrawerTheme">
@@ -150,6 +162,7 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
 
@@ -162,6 +175,7 @@
         <item name="android:colorBackground">@color/md_grey_50</item>
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
     <style name="NoBarTealOrangeDark" parent="MaterialDrawerTheme">
@@ -174,6 +188,7 @@
         <item name="bnbBackgroundColor">@color/md_grey_900</item>
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
 </resources>

app/src/main/res/xml/pref_general.xml

@@ -39,6 +39,11 @@
         android:title="@string/pref_general_category_displaying">
 
     </PreferenceCategory>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="account_header_displaying"
+        android:summary="@string/display_header_drawer_summary"
+        android:title="@string/display_header_drawer_title" />
     <SwitchPreference
         android:defaultValue="false"
         android:key="card_view_active"

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.3-2'
+    ext.kotlin_version = '1.1.4-3'
     repositories {
-        maven { url 'https://maven.google.com' }
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta5'
         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 @@
-#Wed Aug 16 19:45:22 CEST 2017
+#Sat Sep 02 11:43:17 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-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip