Added apk link to readme.

.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,4 +1,23 @@
-**1.5.2.13**
+**1.5.3.00**
+
+- (BETA) Added pull from bottom to load more pages of results. May be buggy.
+
+**1.5.2.18/19**
+
+- APK minification finally working. That means less space taken !
+- Added an option to log every API call.
+
+**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.
 

README.md

@@ -12,6 +12,8 @@ This is the repo of [Reader For Selfoss](https://play.google.com/store/apps/deta
 
 It's an RSS Reader for Android, that **only** works with [Selfoss](https://selfoss.aditu.de/)
 
+The last APK built from source is available [here](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/lastSuccessfulBuild/artifact/SignApksBuilder-out/selfoss-key/selfoss/app-githubConfig-release-unsigned.apk/app-githubConfig-release.apk).
+
 
 ## Want to help ?
 

app/build.gradle

@@ -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'
         }
@@ -125,7 +131,7 @@ dependencies {
 
     // Retrofit + http logging + okhttp
     compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
     compile 'com.burgstaller:okhttp-digest:1.12'
 
@@ -137,13 +143,11 @@ dependencies {
     compile 'org.sufficientlysecure:html-textview:3.3'
 
     // glide
-    compile('com.github.bumptech.glide:glide:4.1.0@aar') {
-        transitive = true;
-    }
-    compile('com.github.bumptech.glide:okhttp3-integration:4.1.0@aar')
+    compile 'com.github.bumptech.glide:glide:4.1.1'
+    compile 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
 
     // 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'
@@ -165,6 +169,7 @@ apply plugin: 'com.google.gms.google-services'
 afterEvaluate {
     initFabricPropertiesIfNeeded()
     initAppLoginPropertiesIfNeeded()
+    initAppForSecretPropertiesIfNeeded()
 }
 
 def initFabricPropertiesIfNeeded() {
@@ -189,3 +194,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

@@ -60,4 +60,13 @@
 
 
 # self signed glidemodule
--keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.AppGlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+-dontwarn com.anupcowkur.reservoir.**
+
+-dontwarn javax.annotation.**

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

@@ -66,7 +66,6 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.ftinc.scoop.Scoop
 import com.mikepenz.materialdrawer.AccountHeader
 import com.mikepenz.materialdrawer.AccountHeaderBuilder
-import com.mikepenz.materialdrawer.holder.DimenHolder
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem
 
 
@@ -97,6 +96,8 @@ 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 var infiniteScroll: Boolean = false
 
     private lateinit var emptyText: TextView
     private lateinit var recyclerView: RecyclerView
@@ -114,6 +115,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private lateinit var sharedPref: SharedPreferences
     private lateinit var firebaseRemoteConfig: FirebaseRemoteConfig
     private lateinit var appColors: AppColors
+    private var offset: Int = 0
+    private var firstVisible: Int = 0
+    private var recyclerViewScrollListener: RecyclerView.OnScrollListener? = null
+
 
 
 
@@ -147,7 +152,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         customTabActivityHelper = CustomTabActivityHelper()
 
         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)
@@ -293,47 +298,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)
+        infiniteScroll = sharedPref.getBoolean("infinite_loading", false)
     }
 
     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
 
-        val headerResult: AccountHeader = AccountHeaderBuilder()
-            .withActivity(this)
-            .withHeaderBackground(R.drawable.bg)
-            .addProfiles(
-                ProfileDrawerItem()
-                    .withName(
-                        dirtyPref.getString("url", "")
-                    )
-                    .withIcon(resources.getDrawable(R.mipmap.ic_launcher))
-            )
-            .withSelectionListEnabledForSingleProfile(false)
-            .build()
+        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)
+                    }
 
-        drawer = DrawerBuilder()
-            .withActivity(this)
-            .withAccountHeader(headerResult)
-            .withHeaderHeight(DimenHolder.fromDp(140))
-            .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 onDrawerClosed(v: View?) {
-                    bottomBar.show()
-                }
+                    override fun onDrawerOpened(v: View?) {
+                        bottomBar.hide()
+                    }
 
-                override fun onDrawerOpened(v: View?) {
-                    bottomBar.hide()
-                }
+                })
 
-            })
-            .build()
+        if (displayAccountHeader && headerResult != null)
+            drawerBuilder.withAccountHeader(headerResult)
+
+        drawer = drawerBuilder.build()
 
         drawer.addStickyFooterItem(
             PrimaryDrawerItem()
@@ -366,7 +380,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 }
                 else {
                     for (tag in maybeTags) {
-                        val gd: GradientDrawable = GradientDrawable()
+                        val gd = GradientDrawable()
                         gd.setColor(Color.parseColor(tag.color))
                         gd.shape = GradientDrawable.RECTANGLE
                         gd.setSize(30, 30)
@@ -559,6 +573,30 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         recyclerView.layoutManager = mLayoutManager
         recyclerView.setHasFixedSize(true)
 
+        if (infiniteScroll) {
+            if (recyclerViewScrollListener == null)
+                recyclerViewScrollListener = object: RecyclerView.OnScrollListener() {
+                    override fun onScrolled(localRecycler: RecyclerView?, dx: Int, dy: Int) {
+                        if (dy > 0) {
+                            if (localRecycler != null) {
+                                val lastVisibleItem: Int = when (mLayoutManager) {
+                                    is StaggeredGridLayoutManager -> mLayoutManager.findLastCompletelyVisibleItemPositions(null).last()
+                                    is GridLayoutManager -> mLayoutManager.findLastCompletelyVisibleItemPosition()
+                                    else -> 0
+                                }
+
+                                if (lastVisibleItem == (items.size - 1)) {
+                                    getElementsAccordingToTab(appendResults = true)
+                                }
+                            }
+                        }
+                    }
+                }
+
+            recyclerView.clearOnScrollListeners()
+            recyclerView.addOnScrollListener(recyclerViewScrollListener)
+        }
+
         bottomBar.setTabSelectedListener(object: BottomNavigationBar.OnTabSelectedListener {
             override fun onTabUnselected(position: Int) = Unit
 
@@ -597,26 +635,31 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             recyclerView.visibility = View.VISIBLE
         }
 
-    private fun getElementsAccordingToTab() =
+    private fun getElementsAccordingToTab(appendResults: Boolean = false) =
         when (elementsShown) {
-            UNREAD_SHOWN -> getUnRead()
-            READ_SHOWN -> getRead()
-            FAV_SHOWN -> getStarred()
-            else -> getUnRead()
+            UNREAD_SHOWN -> getUnRead(appendResults)
+            READ_SHOWN -> getRead(appendResults)
+            FAV_SHOWN -> getStarred(appendResults)
+            else -> getUnRead(appendResults)
         }
 
-    private fun doCallTo(toastMessage: Int, call: (String?, Long?, String?) -> Call<List<Item>>) {
+    private fun doCallTo(appendResults: Boolean, toastMessage: Int, call: (String?, Long?, String?) -> Call<List<Item>>) {
         fun handleItemsResponse(response: Response<List<Item>>) {
             val didUpdate = (response.body() != items)
             if (response.body() != null) {
                 if (response.body() != items) {
-                    items = response.body() as ArrayList<Item>
+                    if (appendResults)
+                        items.addAll(response.body() as ArrayList<Item>)
+                    else
+                        items = response.body() as ArrayList<Item>
                 }
             } else {
-                items = ArrayList()
+                if (!appendResults)
+                    items = ArrayList()
             }
             if (didUpdate)
-                handleListResult()
+                handleListResult(appendResults)
+
             mayBeEmpty()
             swipeRefreshLayout.isRefreshing = false
         }
@@ -637,22 +680,40 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             })
     }
 
-    private fun getUnRead() {
+    private fun getUnRead(appendResults: Boolean = false) {
+        offset =  if (appendResults) (offset + itemsNumber)
+                  else 0
+        firstVisible = if (appendResults) firstVisible else 0
         elementsShown = UNREAD_SHOWN
-        doCallTo(R.string.cant_get_new_elements){t, id, f -> api.newItems(t, id, f, itemsNumber)}
+        doCallTo(appendResults, R.string.cant_get_new_elements){t, id, f -> api.newItems(t, id, f, itemsNumber, offset)}
     }
 
-    private fun getRead() {
+    private fun getRead(appendResults: Boolean = false) {
+        offset =  if (appendResults) (offset + itemsNumber)
+                  else 0
+        firstVisible = if (appendResults) firstVisible else 0
         elementsShown = READ_SHOWN
-        doCallTo(R.string.cant_get_read){t, id, f -> api.readItems(t, id, f)}
+        doCallTo(appendResults, R.string.cant_get_read){t, id, f -> api.readItems(t, id, f, itemsNumber, offset)}
     }
 
-    private fun getStarred() {
+    private fun getStarred(appendResults: Boolean = false) {
+        offset =  if (appendResults) (offset + itemsNumber)
+                  else 0
+        firstVisible = if (appendResults) firstVisible else 0
         elementsShown = FAV_SHOWN
-        doCallTo(R.string.cant_get_favs){t, id, f -> api.starredItems(t, id, f)}
+        doCallTo(appendResults, R.string.cant_get_favs){t, id, f -> api.starredItems(t, id, f, itemsNumber, offset)}
     }
 
-    private fun handleListResult() {
+    private fun handleListResult(appendResults: Boolean = false) {
+        if (appendResults) {
+            val oldManager = recyclerView.layoutManager
+            firstVisible = if ((oldManager is StaggeredGridLayoutManager)) {
+                oldManager.findFirstCompletelyVisibleItemPositions(null).last()
+            }
+            else
+                (oldManager as GridLayoutManager)?.findFirstCompletelyVisibleItemPosition()
+        }
+
         reloadLayoutManager()
 
         val mAdapter: RecyclerView.Adapter<*>
@@ -685,6 +746,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         recyclerView.adapter = mAdapter
         mAdapter.notifyDataSetChanged()
 
+        if (appendResults) {
+            recyclerView.scrollToPosition(firstVisible!!)
+        }
+
         reloadBadges()
     }
 

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

@@ -17,7 +17,7 @@ class IntroActivity : MaterialIntroActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
         addSlide(SlideFragmentBuilder()
             .backgroundColor(R.color.colorPrimary)

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

@@ -16,14 +16,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.*
-
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.LibsBuilder
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.Config
@@ -31,7 +23,12 @@ import apps.amine.bou.readerforselfoss.utils.checkAndDisplayStoreApk
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.crashlytics.android.Crashlytics
 import com.ftinc.scoop.Scoop
-import io.fabric.sdk.android.Fabric
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.mikepenz.aboutlibraries.Libs
+import com.mikepenz.aboutlibraries.LibsBuilder
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 
 class LoginActivity : AppCompatActivity() {
@@ -211,7 +208,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")

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

@@ -12,6 +12,8 @@ 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
@@ -49,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()
     }
 

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

@@ -1,7 +1,5 @@
 package apps.amine.bou.readerforselfoss
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,23 +7,21 @@ import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
-
-import com.bumptech.glide.Glide
-import org.sufficientlysecure.htmltextview.HtmlHttpImageGetter
-import org.sufficientlysecure.htmltextview.HtmlTextView
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import xyz.klinker.android.drag_dismiss.activity.DragDismissActivity
-
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 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.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
+import org.sufficientlysecure.htmltextview.HtmlHttpImageGetter
+import org.sufficientlysecure.htmltextview.HtmlTextView
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import xyz.klinker.android.drag_dismiss.activity.DragDismissActivity
 
 
 class ReaderActivity : DragDismissActivity() {
@@ -51,7 +47,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)
 

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/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(val title: String,
-                    val content: String,
-                    val date_published: String,
-                    val lead_image_url: String,
-                    val dek: String,
-                    val url: String,
-                    val domain: String,
-                    val excerpt: String,
-                    val total_pages: Int,
-                    val rendered_pages: Int,
-                    val next_page_url: String) : Parcelable {
+class ParsedContent(@SerializedName("title") val title: String,
+                    @SerializedName("content") val content: String,
+                    @SerializedName("date_published") val date_published: String,
+                    @SerializedName("lead_image_url") val lead_image_url: String,
+                    @SerializedName("dek") val dek: String,
+                    @SerializedName("url") val url: String,
+                    @SerializedName("domain") val domain: String,
+                    @SerializedName("excerpt") val excerpt: String,
+                    @SerializedName("total_pages") val total_pages: Int,
+                    @SerializedName("rendered_pages") val rendered_pages: Int,
+                    @SerializedName("next_page_url") 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

@@ -19,10 +19,13 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+
+
 
 
 // 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)
@@ -42,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()
     }
 
 
@@ -69,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)
@@ -87,17 +99,17 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
     fun login(): Call<SuccessResponse> =
         service.loginToSelfoss(config.userLogin, config.userPassword)
 
-    fun readItems(tag: String?, sourceId: Long?, search: String?): Call<List<Item>> =
-        getItems("read", tag, sourceId, search, 200)
+    fun readItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int, offset: Int): Call<List<Item>> =
+        getItems("read", tag, sourceId, search, itemsNumber, offset)
 
-    fun newItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int): Call<List<Item>> =
-        getItems("unread", tag, sourceId, search, itemsNumber)
+    fun newItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int, offset: Int): Call<List<Item>> =
+        getItems("unread", tag, sourceId, search, itemsNumber, offset)
 
-    fun starredItems(tag: String?, sourceId: Long?, search: String?): Call<List<Item>> =
-        getItems("starred", tag, sourceId, search, 200)
+    fun starredItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int, offset: Int): Call<List<Item>> =
+        getItems("starred", tag, sourceId, search, itemsNumber, offset)
 
-    private fun getItems(type: String, tag: String?, sourceId: Long?, search: String?, items: Int): Call<List<Item>> =
-        service.getItems(type, tag, sourceId, search, userName, password, items)
+    private fun getItems(type: String, tag: String?, sourceId: Long?, search: String?, items: Int, offset: Int): Call<List<Item>> =
+        service.getItems(type, tag, sourceId, search, userName, password, items, offset)
 
     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,
-                   val title: String,
-                   val tags: String,
-                   val spout: String,
-                   val error: String,
-                   val icon: String) {
+data class Sources(@SerializedName("id") val id: String,
+                   @SerializedName("title") val title: String,
+                   @SerializedName("tags") val tags: String,
+                   @SerializedName("spout") val spout: String,
+                   @SerializedName("error") val error: 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,
-                val datetime: String,
-                val title: String,
-                val unread: Boolean,
-                val starred: Boolean,
-                val thumbnail: String,
-                val icon: String,
-                val link: String,
-                val sourcetitle: String) : Parcelable {
+data class Item(@SerializedName("id") val id: String,
+                @SerializedName("datetime") val datetime: String,
+                @SerializedName("title") val title: String,
+                @SerializedName("unread") val unread: Boolean,
+                @SerializedName("starred") val starred: Boolean,
+                @SerializedName("thumbnail") val thumbnail: String,
+                @SerializedName("icon") val icon: String,
+                @SerializedName("link") val link: String,
+                @SerializedName("sourcetitle") val sourcetitle: String) : Parcelable {
 
     var config: Config? = null
 
@@ -109,14 +114,14 @@ data class Item(val id: String,
     // TODO: maybe find a better way to handle these kind of urls
     fun getLinkDecoded(): String {
         var stringUrl: String
-        if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
+        stringUrl = if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
             if (link.contains("&url=")) {
-                stringUrl = link.substringAfter("&url=")
+                link.substringAfter("&url=")
             } else {
-                stringUrl = this.link.replace("&", "&")
+                this.link.replace("&", "&")
             }
         } else {
-            stringUrl = this.link.replace("&", "&")
+            this.link.replace("&", "&")
         }
 
         // handle :443 => https

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

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

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/themes/AppColors.kt

@@ -5,8 +5,6 @@ import android.content.Context
 import android.support.annotation.ColorInt
 import android.util.TypedValue
 import apps.amine.bou.readerforselfoss.R
-import java.lang.reflect.AccessibleObject.setAccessible
-
 
 
 class AppColors(a: Activity) {

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

@@ -97,7 +97,7 @@ fun String.longHash(): Long {
     val l = this.length
     val chars = this.toCharArray()
 
-    for (i in 0..l - 1) {
+    for (i in 0 until l) {
         h = 31 * h + chars[i].toLong()
     }
     return h

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

@@ -16,7 +16,7 @@ fun String.toTextDrawableString(): String {
 }
 
 fun Item.sourceAndDateText(): String {
-    var formattedDate: String = try {
+    val formattedDate: String = try {
         " " + DateUtils.getRelativeTimeSpanString(
             SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(this.datetime).time,
             Date().time,

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

@@ -7,14 +7,10 @@ import android.content.Intent
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.support.customtabs.CustomTabsIntent
-
-import xyz.klinker.android.drag_dismiss.DragDismissIntentBuilder
-
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.ReaderActivity
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
-
+import xyz.klinker.android.drag_dismiss.DragDismissIntentBuilder
 
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {

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

@@ -145,4 +145,10 @@
     <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>
+    <string name="pref_general_infinite_loading_title">(BETA) Charger plus d\'articles au scroll</string>
 </resources>

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

@@ -145,4 +145,11 @@
     <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>
+    <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
 </resources>

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

@@ -147,4 +147,11 @@
     <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>
+    <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
 </resources>

app/src/main/res/xml/pref_debug.xml

@@ -1,6 +1,13 @@
 <?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"

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

@@ -1,5 +1,4 @@
-<PreferenceScreen xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--<SwitchPreference
         android:defaultValue="false"
@@ -18,6 +17,11 @@
         android:selectAllOnFocus="true"
         android:singleLine="true"
         android:title="@string/pref_api_items_number_title" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="infinite_loading"
+        android:title="@string/pref_general_infinite_loading_title" />
     <PreferenceCategory
         android:title="@string/pref_general_category_links">
 
@@ -39,6 +43,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

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
+        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