Fixes #10. Fixes #68.

.github/CONTRIBUTING.md

@@ -22,7 +22,8 @@ Always check if the web version of your instance is working.
 ### Bug reports/Feature request
 
 * Always search before reporting an issue or asking for a feature to avoid duplicates.
-* Include every usefull details (app version, phone model, Android version and screenshots when possible)
+* Include your unique user id. It's displayed on the debug settings page. (You can tap it, it'll be copied to your clipboard)
+* Include every other useful details (app version, phone model, Android version and screenshots when possible).
 * Avoid bumping non-fatal issues, or feature requests. I'll try to fix them as soon as possible, and try to prioritize the requests. (You may wan to use the [reactions](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) for that)
 
 ### Pull requests
@@ -45,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
+    - mercuryApiKey: A [Mercury](https://mercury.postlight.com/web-parser/) web parser api key for the internal browser
-    - feedback_email: An email to receive users  feedback.
+    - feedbackEmail: An email to receive users  feedback.
-    - source_url: an url to the source code, used in the settings
+    - sourceUrl: an url to the source code, used in the settings
-    - tracker_url: an url to the tracker, used in the settings
+    - trackerUrl: 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)
+
+### 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,39 @@
+**1.5.2.18/19**
+
+- APK minification finally working. That means less space taken !
+
+**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.
+
+**1.5.2.08/09/10**
+
+- Added settable logs for reading articles problems.
+
+**1.5.2.07**
+
+- Added the ability to choose the number of items loaded (the maximum value is 200 and is imposed by the selfoss api)
+
 **1.5.2.06**
 
 - Fix problem introduced in 1.5.2.04. SVG file not working on older versions of android.

README.md

@@ -22,8 +22,3 @@ Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob
 - [Check what changed](https://github.com/aminecmi/ReaderforSelfoss/blob/master/CHANGELOG.md)
 - [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 - [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
-
-
-#Icon
-
-I used RSS Document by AlfredoCreates.com from the Noun Project. You can see it [here](https://thenounproject.com/search/?q=rss&i=596333).

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.espresso:espresso-core:3.0.0'
-    androidTestCompile 'com.android.support.test:runner:0.5'
+    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,10 +143,13 @@ 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'
+    compile 'com.github.stkent:amplify:2.1.0'
 
     // For the article reader
     compile 'com.klinkerapps:drag-dismiss-activity:1.4.3'
@@ -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

@@ -57,3 +57,11 @@
 
 #Bottom bar lib
 -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/AddSourceActivity.kt

@@ -45,7 +45,7 @@ class AddSourceActivity : AppCompatActivity() {
 
         try {
             val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-            api = SelfossApi(this, this@AddSourceActivity, prefs.getBoolean("isSelfSignedCert", false))
+            api = SelfossApi(this, this@AddSourceActivity, prefs.getBoolean("isSelfSignedCert", false), prefs.getBoolean("should_log_everything", false))
         } catch (e: IllegalArgumentException) {
             mustLoginToAddSource()
         }

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 {
@@ -80,16 +83,20 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private var items: ArrayList<Item> = ArrayList()
     private var clickBehavior = false
+    private var debugReadingItems = false
     private var internalBrowser = false
     private var articleViewer = false
     private var shouldBeCardView = false
     private var displayUnreadCount = false
     private var displayAllCount = false
     private var fullHeightCards: Boolean = false
+    private var itemsNumber: Int = 200
     private var elementsShown: Int = 0
     private var maybeTagFilter: Tag? = null
     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
@@ -139,15 +146,15 @@ 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))
+        api = SelfossApi(this, this@HomeActivity, dirtyPref.getBoolean("isSelfSignedCert", false), dirtyPref.getBoolean("should_log_everything", false))
         items = ArrayList()
 
         appColors =  AppColors(this@HomeActivity)
 
         handleBottomBar()
 
-        handleDrawer()
+        handleDrawer(dirtyPref)
 
         coordinatorLayout = findViewById(R.id.coordLayout)
         swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout)
@@ -276,6 +283,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
 
     private fun handleSharedPrefs() {
+        debugReadingItems = sharedPref.getBoolean("read_debug", false)
         clickBehavior = sharedPref.getBoolean("tab_on_tap", false)
         internalBrowser = sharedPref.getBoolean("prefer_internal_browser", true)
         articleViewer = sharedPref.getBoolean("prefer_article_viewer", true)
@@ -283,11 +291,32 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         displayUnreadCount = sharedPref.getBoolean("display_unread_count", true)
         displayAllCount = sharedPref.getBoolean("display_other_count", false)
         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() {
+    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", "")
+                        )
+                        .withIcon(resources.getDrawable(R.mipmap.ic_launcher))
+                )
+                .withSelectionListEnabledForSingleProfile(false)
+                .build()
+        } else null
 
-        drawer = DrawerBuilder()
+        val drawerBuilder =
+            DrawerBuilder()
                 .withActivity(this)
                 .withRootView(R.id.drawer_layout)
                 .withToolbar(toolbar)
@@ -308,27 +337,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     }
 
                 })
-            .build()
 
-        drawer.addStickyFooterItem(
+        if (displayAccountHeader && headerResult != null)
-            PrimaryDrawerItem()
+            drawerBuilder.withAccountHeader(headerResult)
-                .withName(R.string.action_about)
+
-                .withSelectable(false)
+        drawer = drawerBuilder.build()
-                .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
-                })
         drawer.addStickyFooterItem(
             PrimaryDrawerItem()
                 .withName(R.string.title_activity_settings)
@@ -432,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))
@@ -444,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)
@@ -612,7 +647,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private fun getUnRead() {
         elementsShown = UNREAD_SHOWN
-        doCallTo(R.string.cant_get_new_elements){t, id, f -> api.newItems(t, id, f)}
+        doCallTo(R.string.cant_get_new_elements){t, id, f -> api.newItems(t, id, f, itemsNumber)}
     }
 
     private fun getRead() {
@@ -639,7 +674,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     internalBrowser,
                     articleViewer,
                     fullHeightCards,
-                    appColors)
+                    appColors,
+                    debugReadingItems,
+                    userIdentifier)
         } else {
             mAdapter =
                 ItemListAdapter(
@@ -649,7 +686,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     customTabActivityHelper,
                     clickBehavior,
                     internalBrowser,
-                    articleViewer)
+                    articleViewer,
+                    debugReadingItems,
+                    userIdentifier)
         }
         recyclerView.adapter = mAdapter
         mAdapter.notifyDataSetChanged()

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

@@ -51,6 +51,7 @@ class LoginActivity : AppCompatActivity() {
     private lateinit var mPasswordView: EditText
     private lateinit var mHTTPPasswordView: EditText
     private lateinit var mLoginFormView: View
+    private lateinit var userIdentifier: String
     private var logErrors: Boolean = false
 
 
@@ -76,6 +77,7 @@ class LoginActivity : AppCompatActivity() {
 
 
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        userIdentifier = settings.getString("unique_id", "")
         logErrors = settings.getBoolean("loging_debug", false)
 
         editor = settings.edit()
@@ -209,7 +211,7 @@ class LoginActivity : AppCompatActivity() {
             editor.putBoolean("isSelfSignedCert", isWithSelfSignedCert)
             editor.apply()
 
-            val api = SelfossApi(this, this@LoginActivity, isWithSelfSignedCert)
+            val api = SelfossApi(this, this@LoginActivity, isWithSelfSignedCert, isWithSelfSignedCert)
             api.login().enqueue(object : Callback<SuccessResponse> {
                 private fun preferenceError(t: Throwable) {
                     editor.remove("url")
@@ -224,6 +226,7 @@ class LoginActivity : AppCompatActivity() {
                     mHTTPLoginView.error = getString(R.string.wrong_infos)
                     mHTTPPasswordView.error = getString(R.string.wrong_infos)
                     if (logErrors) {
+                        Crashlytics.setUserIdentifier(userIdentifier)
                         Crashlytics.log(100, "LOGIN_DEBUG_ERRROR", t.message)
                         Crashlytics.logException(t)
                         Toast.makeText(this@LoginActivity, t.message, Toast.LENGTH_LONG).show()

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

@@ -6,18 +6,26 @@ import android.net.Uri
 import android.preference.PreferenceManager
 import android.support.multidex.MultiDexApplication
 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.feedback.DefaultEmailFeedbackCollector
+import com.github.stkent.amplify.feedback.GooglePlayStoreFeedbackCollector
 import com.github.stkent.amplify.tracking.Amplify
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import io.fabric.sdk.android.Fabric
 import java.io.IOException
+import java.util.UUID.randomUUID
+
+
 
 
 class MyApp : MultiDexApplication() {
+
     override fun onCreate() {
         super.onCreate()
         Fabric.with(this, Crashlytics())
@@ -26,6 +34,13 @@ class MyApp : MultiDexApplication() {
 
         initCache()
 
+        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        if (prefs.getString("unique_id", "").isEmpty()) {
+            val editor = prefs.edit()
+            editor.putString("unique_id", randomUUID().toString())
+            editor.apply()
+        }
+
         initDrawerImageLoader()
 
         initTheme()
@@ -36,7 +51,8 @@ class MyApp : MultiDexApplication() {
 
     private fun initAmplify() {
         Amplify.initSharedInstance(this)
-            .setFeedbackEmailAddress(getString(R.string.feedback_email))
+            .setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
+            .setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(BuildConfig.FEEDBACK_EMAIL))
             .applyAllDefaultRules()
     }
 
@@ -51,11 +67,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/SourcesActivity.kt

@@ -40,7 +40,7 @@ class SourcesActivity : AppCompatActivity() {
 
         val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 
-        val api = SelfossApi(this, this@SourcesActivity, prefs.getBoolean("isSelfSignedCert", false))
+        val api = SelfossApi(this, this@SourcesActivity, prefs.getBoolean("isSelfSignedCert", false), prefs.getBoolean("should_log_everything", false))
         var items: ArrayList<Sources> = ArrayList()
 
         mFab.attachToRecyclerView(mRecyclerView)

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

@@ -2,15 +2,12 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
-import android.graphics.Bitmap
 import android.graphics.Color
 import android.support.constraint.ConstraintLayout
 import android.support.design.widget.Snackbar
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
 import android.support.v7.widget.CardView
 import android.support.v7.widget.RecyclerView
 import android.text.Html
-import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageButton
@@ -22,15 +19,11 @@ import android.widget.Toast
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.BitmapImageViewTarget
 import com.like.LikeButton
 import com.like.OnLikeListener
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
 
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
@@ -39,6 +32,11 @@ 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
 
 class ItemCardAdapter(private val app: Activity,
                       private val items: ArrayList<Item>,
@@ -47,7 +45,9 @@ class ItemCardAdapter(private val app: Activity,
                       private val internalBrowser: Boolean,
                       private val articleViewer: Boolean,
                       private val fullHeightCards: Boolean,
-                      private val appColors: AppColors) : RecyclerView.Adapter<ItemCardAdapter.ViewHolder>() {
+                      private val appColors: AppColors,
+                      val debugReadingItems: Boolean,
+                      val userIdentifier: String) : RecyclerView.Adapter<ItemCardAdapter.ViewHolder>() {
     private val c: Context = app.baseContext
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
 
@@ -66,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) {
@@ -130,11 +130,31 @@ class ItemCardAdapter(private val app: Activity,
 
         api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
             override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+                if (debugReadingItems) {
+                    val message =
+                        "message: ${response.message()} " +
+                            "response isSuccess: ${response.isSuccessful} " +
+                            "response code: ${response.code()} " +
+                            "response message: ${response.message()} " +
+                            "response errorBody: ${response.errorBody()?.string()} " +
+                            "body success: ${response.body()?.success} " +
+                            "body isSuccess: ${response.body()?.isSuccess}"
+                    Crashlytics.setUserIdentifier(userIdentifier)
+                    Crashlytics.log(100, "READ_DEBUG_SUCCESS", message)
+                    Crashlytics.logException(Exception("Was success, but did it work ?"))
 
+                    Toast.makeText(c, message, Toast.LENGTH_LONG).show()
+                }
                 doUnmark(i, position)
             }
 
             override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                if (debugReadingItems) {
+                    Crashlytics.setUserIdentifier(userIdentifier)
+                    Crashlytics.log(100, "READ_DEBUG_ERROR", t.message)
+                    Crashlytics.logException(t)
+                    Toast.makeText(c, t.message, Toast.LENGTH_LONG).show()
+                }
                 Toast.makeText(app, app.getString(R.string.cant_mark_read), Toast.LENGTH_SHORT).show()
                 items.add(i)
                 notifyItemInserted(position)

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

@@ -3,16 +3,11 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
 import android.graphics.Color
-import android.net.Uri
 import android.support.constraint.ConstraintLayout
 import android.support.design.widget.Snackbar
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
 import android.support.v7.widget.RecyclerView
 import android.text.Html
-import android.text.format.DateUtils
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
@@ -21,24 +16,23 @@ import android.widget.*
 
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.BitmapImageViewTarget
 import com.like.LikeButton
 import com.like.OnLikeListener
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import java.text.ParseException
-import java.text.SimpleDateFormat
 import java.util.*
 
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 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.circularBitmapDrawable
+import com.crashlytics.android.Crashlytics
+import kotlin.collections.ArrayList
 
 
 class ItemListAdapter(private val app: Activity,
@@ -47,7 +41,9 @@ class ItemListAdapter(private val app: Activity,
                       private val helper: CustomTabActivityHelper,
                       private val clickBehavior: Boolean,
                       private val internalBrowser: Boolean,
-                      private val articleViewer: Boolean) : RecyclerView.Adapter<ItemListAdapter.ViewHolder>() {
+                      private val articleViewer: Boolean,
+                      val debugReadingItems: Boolean,
+                      val userIdentifier: String) : RecyclerView.Adapter<ItemListAdapter.ViewHolder>() {
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val c: Context = app.baseContext
     private val bars: ArrayList<Boolean> = ArrayList(Collections.nCopies(items.size + 1, false))
@@ -142,11 +138,31 @@ class ItemListAdapter(private val app: Activity,
 
         api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
             override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+                if (debugReadingItems) {
+                    val message =
+                        "message: ${response.message()} " +
+                            "response isSuccess: ${response.isSuccessful} " +
+                            "response code: ${response.code()} " +
+                            "response message: ${response.message()} " +
+                            "response errorBody: ${response.errorBody()?.string()} " +
+                            "body success: ${response.body()?.success} " +
+                            "body isSuccess: ${response.body()?.isSuccess}"
+                    Crashlytics.setUserIdentifier(userIdentifier)
+                    Crashlytics.log(100, "READ_DEBUG_SUCCESS", message)
+                    Crashlytics.logException(Exception("Was success, but did it work ?"))
+                    Toast.makeText(c, message, Toast.LENGTH_LONG).show()
+                }
                 doUnmark(i, position)
 
             }
 
             override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                if (debugReadingItems) {
+                    Crashlytics.setUserIdentifier(userIdentifier)
+                    Crashlytics.log(100, "READ_DEBUG_ERROR", t.message)
+                    Crashlytics.logException(t)
+                    Toast.makeText(c, t.message, Toast.LENGTH_LONG).show()
+                }
                 Toast.makeText(app, app.getString(R.string.cant_mark_read), Toast.LENGTH_SHORT).show()
                 items.add(i)
                 notifyItemInserted(position)

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/mercury/MercuryModels.kt

@@ -2,20 +2,20 @@ package apps.amine.bou.readerforselfoss.api.mercury
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 
-
+class ParsedContent(@SerializedName("title") val title: String,
-class ParsedContent(val title: String,
+                    @SerializedName("content") val content: String,
-                    val content: String,
+                    @SerializedName("date_published") val date_published: String,
-                    val date_published: String,
+                    @SerializedName("lead_image_url") val lead_image_url: String,
-                    val lead_image_url: String,
+                    @SerializedName("dek") val dek: String,
-                    val dek: String,
+                    @SerializedName("url") val url: String,
-                    val url: String,
+                    @SerializedName("domain") val domain: String,
-                    val domain: String,
+                    @SerializedName("excerpt") val excerpt: String,
-                    val excerpt: String,
+                    @SerializedName("total_pages") val total_pages: Int,
-                    val total_pages: Int,
+                    @SerializedName("rendered_pages") val rendered_pages: Int,
-                    val rendered_pages: Int,
+                    @SerializedName("next_page_url") val next_page_url: String) : Parcelable {
-                    val next_page_url: String) : Parcelable {
 
     companion object {
         @JvmField val CREATOR: Parcelable.Creator<ParsedContent> = object : Parcelable.Creator<ParsedContent> {

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,13 +18,14 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 import apps.amine.bou.readerforselfoss.utils.Config
-import java.security.cert.CertificateException
+import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
-import java.security.cert.X509Certificate
+import okhttp3.logging.HttpLoggingInterceptor
-import javax.net.ssl.*
+
+
 
 
 // codebeat:disable[ARITY,TOO_MANY_FUNCTIONS]
-class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Boolean) {
+class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Boolean, shouldLog: Boolean) {
 
     private lateinit var service: SelfossService
     private val config: Config = Config(c)
@@ -38,36 +34,7 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
 
     fun OkHttpClient.Builder.maybeWithSelfSigned(isWithSelfSignedCert: Boolean): OkHttpClient.Builder =
         if (isWithSelfSignedCert) {
-            try {
+            getUnsafeHttpClient()
-                // 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
         }
@@ -78,14 +45,13 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
             .with("basic", BasicAuthenticator(this))
             .build()
 
-    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient {
+    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient.Builder {
         val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
         return OkHttpClient
             .Builder()
             .maybeWithSelfSigned(isWithSelfSignedCert)
             .authenticator(CachingAuthenticatorDecorator(this, authCache))
             .addInterceptor(AuthenticationCacheInterceptor(authCache))
-            .build()
     }
 
 
@@ -105,13 +71,23 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
                 .setLenient()
                 .create()
 
+        val logging = HttpLoggingInterceptor()
+
+        logging.level = if (shouldLog)
+            HttpLoggingInterceptor.Level.BODY
+        else
+            HttpLoggingInterceptor.Level.NONE
+
+        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert)
+
+        httpClient.addInterceptor(logging)
 
         try {
             val retrofit =
                 Retrofit
                     .Builder()
                     .baseUrl(config.baseUrl)
-                    .client(authenticator.getHttpClien(isWithSelfSignedCert))
+                    .client(httpClient.build())
                     .addConverterFactory(GsonConverterFactory.create(gson))
                     .build()
             service = retrofit.create(SelfossService::class.java)
@@ -124,16 +100,16 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
         service.loginToSelfoss(config.userLogin, config.userPassword)
 
     fun readItems(tag: String?, sourceId: Long?, search: String?): Call<List<Item>> =
-        getItems("read", tag, sourceId, search)
+        getItems("read", tag, sourceId, search, 200)
 
-    fun newItems(tag: String?, sourceId: Long?, search: String?): Call<List<Item>> =
+    fun newItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int): Call<List<Item>> =
-        getItems("unread", tag, sourceId, search)
+        getItems("unread", tag, sourceId, search, itemsNumber)
 
     fun starredItems(tag: String?, sourceId: Long?, search: String?): Call<List<Item>> =
-        getItems("starred", tag, sourceId, search)
+        getItems("starred", tag, sourceId, search, 200)
 
-    private fun getItems(type: String, tag: String?, sourceId: Long?, search: String?): Call<List<Item>> =
+    private fun getItems(type: String, tag: String?, sourceId: Long?, search: String?, items: Int): Call<List<Item>> =
-        service.getItems(type, tag, sourceId, search, userName, password)
+        service.getItems(type, tag, sourceId, search, userName, password, items)
 
     fun markItem(itemId: String): Call<SuccessResponse> =
         service.markAsRead(itemId, userName, password)

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

@@ -7,7 +7,7 @@ import android.os.Parcelable
 
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
-
+import com.google.gson.annotations.SerializedName
 
 
 private fun constructUrl(config: Config?, path: String, file: String): String {
@@ -19,23 +19,28 @@ private fun constructUrl(config: Config?, path: String, file: String): String {
 }
 
 
-data class Tag(val tag: String, val color: String, val unread: Int)
+data class Tag(@SerializedName("tag") val tag: String,
+               @SerializedName("color") val color: String,
+               @SerializedName("unread") val unread: Int)
 
-class SuccessResponse(val success: Boolean) {
+class SuccessResponse(@SerializedName("success") val success: Boolean) {
     val isSuccess: Boolean
         get() = success
 }
 
-class Stats(val total: Int, val unread: Int, val starred: Int)
+class Stats(@SerializedName("total") val total: Int,
+            @SerializedName("unread") val unread: Int,
+            @SerializedName("starred") val starred: Int)
 
-data class Spout(val name: String, val description: String)
+data class Spout(@SerializedName("name") val name: String,
+                 @SerializedName("description") val description: String)
 
-data class Sources(val id: String,
+data class Sources(@SerializedName("id") val id: String,
-                   val title: String,
+                   @SerializedName("title") val title: String,
-                   val tags: String,
+                   @SerializedName("tags") val tags: String,
-                   val spout: String,
+                   @SerializedName("spout") val spout: String,
-                   val error: String,
+                   @SerializedName("error") val error: String,
-                   val icon: String) {
+                   @SerializedName("icon") val icon: String) {
     var config: Config? = null
 
     fun getIcon(app: Context): String {
@@ -47,15 +52,15 @@ data class Sources(val id: String,
 
 }
 
-data class Item(val id: String,
+data class Item(@SerializedName("id") val id: String,
-                val datetime: String,
+                @SerializedName("datetime") val datetime: String,
-                val title: String,
+                @SerializedName("title") val title: String,
-                val unread: Boolean,
+                @SerializedName("unread") val unread: Boolean,
-                val starred: Boolean,
+                @SerializedName("starred") val starred: Boolean,
-                val thumbnail: String,
+                @SerializedName("thumbnail") val thumbnail: String,
-                val icon: String,
+                @SerializedName("icon") val icon: String,
-                val link: String,
+                @SerializedName("link") val link: String,
-                val sourcetitle: String) : Parcelable {
+                @SerializedName("sourcetitle") val sourcetitle: String) : Parcelable {
 
     var config: Config? = null
 

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

@@ -22,7 +22,8 @@ internal interface SelfossService {
                  @Query("source") source: Long?,
                  @Query("search") search: String?,
                  @Query("username") username: String,
-                 @Query("password") password: String): Call<List<Item>>
+                 @Query("password") password: String,
+                 @Query("items") items: Int): Call<List<Item>>
 
     @POST("mark/{id}")
     fun markAsRead(@Path("id") id: String,

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

@@ -2,24 +2,34 @@ package apps.amine.bou.readerforselfoss.settings;
 
 
 import android.annotation.TargetApi;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.SwitchPreference;
 import android.support.v7.app.ActionBar;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.view.MenuItem;
+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;
 
 
@@ -145,6 +155,22 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                     return true;
                 }
             });
+
+            EditTextPreference itemsNumber = (EditTextPreference) findPreference("prefer_api_items_number");
+            itemsNumber.getEditText().setFilters(new InputFilter[]{
+                new InputFilter (){
+
+                    @Override
+                    public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+                        try {
+                            int input = Integer.parseInt(dest.toString() + source.toString());
+                            if (input <= 200 && input >0)
+                                return null;
+                        } catch (NumberFormatException nfe) { }
+                        return "";
+                    }
+                }
+            });
         }
 
         @Override
@@ -165,6 +191,25 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             super.onCreate(savedInstanceState);
             addPreferencesFromResource(R.xml.pref_debug);
             setHasOptionsMenu(true);
+
+            SharedPreferences pref = getActivity().getSharedPreferences(Config.Companion.getSettingsName(), Context.MODE_PRIVATE);
+            final String id = pref.getString("unique_id", "...");
+
+            final Preference identifier = findPreference("debug_identifier");
+            final ClipboardManager clipboard = (ClipboardManager)
+                    getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+
+            identifier.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    ClipData clip = ClipData.newPlainText("Selfoss unique id", id);
+                    clipboard.setPrimaryClip(clip);
+
+                    Toast.makeText(getActivity(), R.string.unique_id_to_clipboard, Toast.LENGTH_LONG).show();
+                    return true;
+                }
+            });
+            identifier.setTitle(id);
         }
 
         @Override
@@ -198,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;
                 }
             });
@@ -206,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

@@ -138,4 +138,16 @@
     <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>
+    <string name="pref_selfoss_category">Api Selfoss</string>
+    <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
+    <string name="read_debug_title">Des articles lus marqués comme non lus ?</string>
+    <string name="read_debug_on">Les appels API vont être logués lorsequ\'un article est marqué comme lu</string>
+    <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>
+    <string name="login_everything_title">Log de tous les appels à l\'API</string>
+    <string name="login_everything_off">Aucun appel à l\'API ne sera logué</string>
+    <string name="login_everything_on">Tous les appels à l\'API vont êtres logués</string>
 </resources>

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

@@ -138,4 +138,17 @@
     <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>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="read_debug_title">Read articles appearing as unread ?</string>
+    <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
+    <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>
+    <string name="login_everything_title">Logging every api calls</string>
+    <string name="login_everything_off">No api call will be logged</string>
+    <string name="login_everything_on">This will log every api call for debug purpose.</string>
 </resources>

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

@@ -140,4 +140,17 @@
     <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>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="read_debug_title">Read articles appearing as unread ?</string>
+    <string name="read_debug_off">No log when marking an item as read</string>
+    <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>
+    <string name="login_everything_title">Logging every api calls</string>
+    <string name="login_everything_on">This will log every api call for debug purpose.</string>
+    <string name="login_everything_off">No api call will be logged</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_debug.xml

@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="should_log_everything"
+        android:summaryOff="@string/login_everything_off"
+        android:summaryOn="@string/login_everything_on"
+        android:title="@string/login_everything_title" />
+
     <SwitchPreference
         android:defaultValue="false"
         android:key="loging_debug"
         android:summaryOff="@string/login_debug_off"
         android:summaryOn="@string/login_debug_on"
         android:title="@string/login_debug_title" />
+
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="read_debug"
+        android:summaryOff="@string/read_debug_off"
+        android:summaryOn="@string/read_debug_on"
+        android:title="@string/read_debug_title" />
+
+    <Preference
+        android:enabled="true"
+        android:key="debug_identifier"
+        android:summary="@string/summary_debug_identifier" />
 </PreferenceScreen>

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

@@ -1,4 +1,5 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--<SwitchPreference
         android:defaultValue="false"
@@ -6,6 +7,17 @@
         android:summary="@string/pref_switch_browser"
         android:title="@string/pref_switch_browser_title"/>-->
 
+    <PreferenceCategory
+        android:title="@string/pref_selfoss_category">
+
+    </PreferenceCategory>
+    <EditTextPreference
+        android:defaultValue="200"
+        android:inputType="number"
+        android:key="prefer_api_items_number"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_api_items_number_title" />
     <PreferenceCategory
         android:title="@string/pref_general_category_links">
 
@@ -27,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