Do not log for test labs devices.

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

app/build.gradle

@@ -1,17 +1,9 @@
 buildscript {
 }
 
-ext {
-    configuration = [
-            buildDate: new Date()
-    ]
-    // This will make me able to build multiple times a day. May break thinks. I may forget it.
-    todaysBuilds = "1"
-}
-
 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=-authordate --format='%(refname:short)' --count=1".execute()
+    return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
 }
 
 def versionCodeFromGit() {
@@ -178,4 +170,4 @@ def initAppLoginPropertiesIfNeeded() {
             entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
         }
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/NoBar">
         <activity
             android:name=".MainActivity"

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

@@ -109,7 +109,7 @@ class AddSourceActivity : AppCompatActivity() {
         super.onResume()
         val config = Config(this)
 
-        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(false, this@AddSourceActivity)) {
             mustLoginToAddSource()
         } else {
             handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)

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

@@ -54,7 +54,6 @@ class LoginActivity : AppCompatActivity() {
 
         handleBaseUrlFail()
 
-
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         userIdentifier = settings.getString("unique_id", "")
         logErrors = settings.getBoolean("login_debug", false)
@@ -145,7 +144,7 @@ class LoginActivity : AppCompatActivity() {
         var cancel = false
         var focusView: View? = null
 
-        if (!url.isBaseUrlValid()) {
+        if (!url.isBaseUrlValid(logErrors, this@LoginActivity)) {
             urlView.error = getString(R.string.login_url_problem)
             focusView = urlView
             cancel = true

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/Acra.kt

@@ -2,11 +2,21 @@ package apps.amine.bou.readerforselfoss.utils
 
 import android.content.Context
 import android.preference.PreferenceManager
+import android.provider.Settings
 import org.acra.ErrorReporter
 
 fun ErrorReporter.maybeHandleSilentException(throwable: Throwable, ctx: Context) {
     val sharedPref = PreferenceManager.getDefaultSharedPreferences(ctx)
-    if (sharedPref.getBoolean("acra_should_log", false)) {
+    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
+
+    if (sharedPref.getBoolean("acra_should_log", false) && !isTestLab) {
+        this.handleSilentException(throwable)
+    }
+}
+
+fun ErrorReporter.doHandleSilentException(throwable: Throwable, ctx: Context) {
+    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
+    if (!isTestLab) {
         this.handleSilentException(throwable)
     }
 }

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/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -19,6 +19,7 @@ import apps.amine.bou.readerforselfoss.ReaderActivity
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
+import org.acra.ACRA
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
@@ -134,7 +135,7 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 fun String.isUrlValid(): Boolean =
     HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 
-fun String.isBaseUrlValid(): Boolean {
+fun String.isBaseUrlValid(logErrors: Boolean, ctx: Context): Boolean {
     val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
@@ -142,7 +143,11 @@ fun String.isBaseUrlValid(): Boolean {
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 
-    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
+    val isValid = Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
+    if (!isValid && logErrors) {
+        ACRA.getErrorReporter().doHandleSilentException(java.lang.Exception("Patterns.WEB_URL.matcher(this).matches() == ${Patterns.WEB_URL.matcher(this).matches()} && existsAndEndsWithSlash == $existsAndEndsWithSlash && baseUrl.pathSegments() == ${baseUrl?.pathSegments()}"), ctx)
+    }
+    return isValid
 }
 
 fun Context.openInBrowserAsNewTask(i: Item) {

app/src/main/res/layout/fragment_article.xml

@@ -9,7 +9,8 @@
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"

app/src/main/res/values-de-rDE/strings.xml

@@ -129,43 +129,43 @@
     <string name="reader_action_share">Teilen</string>
     <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
     <string name="add_to_favs_reader">Zu Favoriten hinzufügen</string>
-    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="remove_to_favs_reader">Aus Favoriten entfernen</string>
     <string name="pref_content_reader_font_size">Article reader content font size</string>
     <string name="pref_header_viewer">Article viewer</string>
     <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
-    <string name="markall_dialog_message">This will mark all the items as read.</string>
-    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
+    <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
     <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
     <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
-    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_enabled">Fehlerberichte werden automatisch gesendet</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
-    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_crash_reports">Fehlerberichte</string>
     <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
-    <string name="acra_login">Enable logging</string>
+    <string name="acra_login">Protokollierung aktivieren</string>
     <string name="drawer_item_hidden_tags">Hidden Tags</string>
-    <string name="unmark">Mark item as unread</string>
+    <string name="unmark">Eintrag als ungelesen markieren</string>
     <string name="pref_header_offline">Offline and cache</string>
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
-    <string name="no_network_connectivity">Not connected !</string>
-    <string name="pref_switch_periodic_refresh">Sync articles</string>
-    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
-    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="no_network_connectivity">Nicht verbunden !</string>
+    <string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
+    <string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>
+    <string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
-    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
-    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="pref_switch_refresh_when_charging">Nur aktualisieren, wenn das Telefon aufgeladen wird</string>
+    <string name="loading_notification_title">Lädt...</string>
+    <string name="loading_notification_text">Selfoss synchronisiert Ihre Artikel</string>
     <string name="notification_channel_sync">Sync notification</string>
     <string name="new_items_channel_sync">New items notification</string>
     <string name="new_items_notification_title">New items !</string>
     <string name="new_items_notification_text">%1$d new items loaded.</string>
     <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
     <string name="shortcut_offline">Offline</string>
-    <string name="pref_api_timeout">Api Timeout</string>
-    <string name="pref_header_experimental">Experimental</string>
+    <string name="pref_api_timeout">API-Zeitüberschreitung</string>
+    <string name="pref_header_experimental">Experimentell</string>
 </resources>

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>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" >
+    </base-config>
+</network-security-config>

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