add toread preference. improve bookmark parsing.

Author: jonschoning

.idea/misc.xml

@@ -11,7 +11,7 @@ android {
         minSdk 28
         targetSdk 31
         versionCode 1
-        versionName "0.0.3"
+        versionName "0.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/build.gradle

@@ -1,9 +1,7 @@
 package com.espial.espialshare
 
-import android.content.Context
 import android.content.Intent
 import android.util.Patterns
-import androidx.preference.PreferenceManager
 import java.net.URLEncoder
 
 class EspialCore {
@@ -13,7 +11,6 @@ class EspialCore {
     }
 
     private fun toEspialGetUrl(espialServerUrl: String, addParams: AddParams): String {
-
         return when (addParams) {
             is AddParams.Bookmark ->
                 "$espialServerUrl/add?url=${enc(addParams.Url)}&title=${enc(addParams.Title)}&description=${enc(addParams.Description)}&next=closeWindow"
@@ -26,26 +23,41 @@ class EspialCore {
         val extraText = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
         val extraSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT) ?: ""
 
-        val res = extraText.split('\n')
-        return if(res.count() > 1) {
-            val lastUrl = res.last().trim().takeWhile { it != '#' }
-            if(isUrl(lastUrl)) {
-                val content = res.dropLast(1).joinToString("\n").removeSurrounding("\"")
-                if(content.length < 80) {
-                    AddParams.Bookmark(lastUrl, content, "")
-                } else {
-                    AddParams.Bookmark(lastUrl, "", content)
-                }
-            } else {
-                AddParams.Note(extraSubject, extraText)
-            }
-        } else if(isUrl(extraText)) {
+        var addParams = trySplitAndParseBookmark(extraText, "\n")
+        if (addParams != null) return addParams
+        addParams = trySplitAndParseBookmark(extraText, " ")
+        if (addParams != null) return addParams
+
+        return if (isUrl(extraText)) {
             AddParams.Bookmark(extraText, extraSubject, "")
+        } else if (isUrl(extraSubject)) {
+            AddParams.Bookmark(extraSubject, extraText, "")
         } else {
             AddParams.Note(extraSubject, extraText)
         }
     }
 
+    private fun trySplitAndParseBookmark(input: String, delimiter: String): AddParams? {
+        val tokens = input.split(delimiter)
+        if (tokens.count() <= 1) {
+            return null
+        }
+        val lastToken = stripHash(tokens.last())
+        if (!isUrl(lastToken)) {
+            return null
+        }
+        val content =
+            tokens.dropLast(1).joinToString(delimiter).removeSurrounding("\"")
+        return if (content.length < 80) {
+            AddParams.Bookmark(lastToken, content, "")
+        } else {
+            AddParams.Bookmark(lastToken, "", content)
+        }
+    }
+
+    private fun stripHash(res: String) =
+        res.trim().takeWhile { it != '#' }
+
     private fun enc(s: String) =
         URLEncoder.encode(s, "utf-8")
 

app/src/main/java/com/espial/espialshare/EspialCore.kt

@@ -60,7 +60,7 @@ class ReadLaterActivity : Activity() {
             Intent.ACTION_SEND -> {
                 if ("text/plain" == intent.type) {
                     val addParams = EspialCore().toAddParams(intent)
-                    val postData = toPostData(addParams)
+                    val postData = toPostData(addParams, sharedPreferences.getBoolean("espial_readlater_marktoread", true))
                     if (postData == null) {
                         finish()
                         return
@@ -89,14 +89,14 @@ class ReadLaterActivity : Activity() {
         return requestBuilder.build()
     }
 
-    private fun toPostData(addParams: EspialCore.AddParams): JSONObject? {
+    private fun toPostData(addParams: EspialCore.AddParams, toRead: Boolean): JSONObject? {
         when (addParams) {
             is EspialCore.AddParams.Bookmark -> {
                 val postData = JSONObject()
                 postData.put("url", addParams.Url)
                 postData.put("title", addParams.Title)
                 postData.put("description", addParams.Description)
-                postData.put("toread", true)
+                postData.put("toread", toRead)
                 return postData
             }
             is EspialCore.AddParams.Note -> {

app/src/main/java/com/espial/espialshare/ReadLaterActivity.kt

@@ -1,19 +1,26 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto" >
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory app:title="@string/config_header">
+   <PreferenceCategory app:title="@string/config_header">
 
         <EditTextPreference
-            app:key="espial_server_url"
             app:defaultValue=""
+            app:key="espial_server_url"
             app:title="Espial Server Url"
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
-            app:key="espial_api_key"
             app:defaultValue=""
+            app:key="espial_api_key"
             app:title="ApiKey"
             app:useSimpleSummaryProvider="true" />
 
     </PreferenceCategory>
+    <PreferenceCategory app:title="Read Later">
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="espial_readlater_marktoread"
+            app:title="Mark as to-read"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
 
 </PreferenceScreen>