Needed to add an exception for the log to work.

CHANGELOG.md

@@ -1,3 +1,7 @@
+**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/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt

@@ -80,12 +80,14 @@ 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
@@ -276,6 +278,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,6 +286,7 @@ 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()
     }
 
     private fun handleDrawer() {
@@ -612,7 +616,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 +643,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     internalBrowser,
                     articleViewer,
                     fullHeightCards,
-                    appColors)
+                    appColors,
+                    debugReadingItems)
         } else {
             mAdapter =
                 ItemListAdapter(
@@ -649,7 +654,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     customTabActivityHelper,
                     clickBehavior,
                     internalBrowser,
-                    articleViewer)
+                    articleViewer,
+                    debugReadingItems)
         }
         recyclerView.adapter = mAdapter
         mAdapter.notifyDataSetChanged()

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,8 @@ 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 com.crashlytics.android.Crashlytics
+import kotlin.collections.ArrayList
 
 class ItemCardAdapter(private val app: Activity,
                       private val items: ArrayList<Item>,
@@ -47,7 +42,8 @@ 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) : RecyclerView.Adapter<ItemCardAdapter.ViewHolder>() {
     private val c: Context = app.baseContext
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
 
@@ -130,11 +126,25 @@ 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()} " +
+                            "body success: ${response.body()?.success} " +
+                            "body isSuccess: ${response.body()?.isSuccess} " +
+                            "raw body string: ${response.raw()?.body()?.string()}"
+                    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.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,21 @@ 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 com.crashlytics.android.Crashlytics
+import kotlin.collections.ArrayList
 
 
 class ItemListAdapter(private val app: Activity,
@@ -47,7 +39,8 @@ 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) : 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 +135,26 @@ 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()} " +
+                            "body success: ${response.body()?.success} " +
+                            "body isSuccess: ${response.body()?.isSuccess} " +
+                            "raw body string: ${response.raw()?.body()?.string()}"
+                    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.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/api/selfoss/SelfossApi.kt

@@ -124,16 +124,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/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

@@ -8,6 +8,7 @@ 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.PreferenceActivity;
@@ -15,6 +16,8 @@ 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 java.util.List;
@@ -145,6 +148,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

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

@@ -138,4 +138,9 @@
     <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>
 </resources>

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

@@ -138,4 +138,9 @@
     <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>
 </resources>

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

@@ -140,4 +140,9 @@
     <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>
 </resources>

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

@@ -7,4 +7,12 @@
         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" />
 </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">