Merge pull request #245 from Binnette/ExtraSubject

Add EXTRA_SUBJECT when sharing link

app/build.gradle

@@ -10,8 +10,8 @@ ext {
 }
 
 def gitVersion() {
-    def process = "git describe --abbrev=0 --tags".execute()
-    return process.text.substring(1).replaceAll("\\.", "").trim()
+    def process = "git for-each-ref refs/tags --sort=-taggerdate --format='%(refname:short)' --count=1".execute()
+    return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
 }
 
 def versionCodeFromGit() {

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

@@ -179,7 +179,8 @@ class ItemCardAdapter(
             })
 
             mView.shareBtn.setOnClickListener {
-                c.shareLink(items[adapterPosition].getLinkDecoded())
+                val item = items[adapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.title)
             }
 
             mView.browserBtn.setOnClickListener {

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -139,7 +139,7 @@ class ArticleFragment : Fragment() {
                 override fun onItemClick(item: MenuItem) {
                     when (item.itemId) {
                         R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
-                        R.id.share_action -> activity!!.shareLink(url)
+                        R.id.share_action -> activity!!.shareLink(url, contentTitle)
                         R.id.open_action -> activity!!.openItemUrl(
                             allItems,
                             pageNumber.toInt(),

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

@@ -25,11 +25,12 @@ fun String.toStringUriWithHttp(): String =
         this
     }
 
-fun Context.shareLink(itemUrl: String) {
+fun Context.shareLink(itemUrl: String, itemTitle: String) {
     val sendIntent = Intent()
     sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
     sendIntent.action = Intent.ACTION_SEND
     sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
+    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
     sendIntent.type = "text/plain"
     startActivity(
         Intent.createChooser(

app/src/main/res/values-es-rES/strings.xml

@@ -166,6 +166,6 @@
     <string name="new_items_notification_text">%1$d artículos cargados.</string>
     <string name="pref_switch_notify_new_items">Notificarme cuando se sincronicen nuevos artículos.</string>
     <string name="shortcut_offline">Sin conexión</string>
-    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_api_timeout">Se acabó el tiempo de espera de la API</string>
     <string name="pref_header_experimental">Experimental</string>
 </resources>

app/src/main/res/values-gl-rES/strings.xml

@@ -166,6 +166,6 @@
     <string name="new_items_notification_text">%1$d novos elementos cargados.</string>
     <string name="pref_switch_notify_new_items">Notificarme cando se sincronicen novos elementos.</string>
     <string name="shortcut_offline">Sen conexión</string>
-    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_api_timeout">Acabouse o tempo de espera da API</string>
     <string name="pref_header_experimental">Experimental</string>
 </resources>

build.sh

@@ -1,9 +1,23 @@
 #!/bin/bash
 
-BASE_VERSION="1.7"
-TODAYS_VERSION="1"
+git fetch --tags -p
 
-VERSION="${BASE_VERSION//./}$(date '+%y%m%j')$TODAYS_VERSION"
+BASE_VERSION="1.7"
+LAST_TAG=$(git tag -l | sort -V | tail -1)
+
+INITIAL_VERSION="${BASE_VERSION//./}$(date '+%y%m%j')"
+
+LAST_DAY_VERSION=$(echo $LAST_TAG | sed "s/v${INITIAL_VERSION}//")
+LAST_DAY_VERSION_LENGTH=$(echo "${#LAST_DAY_VERSION}")
+
+if [[ "$LAST_DAY_VERSION_LENGTH" == "1" ]]
+then
+    TODAYS_VERSION=$(( $LAST_DAY_VERSION + 1 ))
+else
+    TODAYS_VERSION="1"
+fi
+
+VERSION="${INITIAL_VERSION}${TODAYS_VERSION}"
 
 PARAMS_EXCEPT_PUBLISH=$(echo $1 | sed 's/\-\-publish//')
 
@@ -13,5 +27,5 @@ if [[ "$@" == *'--publish'* ]]
 then
     ./publish-version.sh ${VERSION}
 else
-    echo "Did not publish. If you wanted to do so, call the script with \"--publish\"."
+    echo "Did not publish. If you wanted to do so, call the script with \"--publish\" or \"--publish-local\"."
 fi

publish-version.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NOTE: This is copy/pasted in jenkins
+
 rm -f version.txt
 printf "versionName=$1-github\nversionCode=$1" >> version.txt