Trying to fix issues with Glide, fragment, and destroyed activity.

.gitignore

@@ -216,4 +216,6 @@ gradle-app.setting
 
 release/
 
-crowdin.properties
+crowdin.properties
+
+publish-version.sh

CHANGELOG.md

@@ -1,5 +1,7 @@
 **1.6.x**
 
+- Fixed pre-lolipop issue with automatic theme changes.
+
 - Removed all Build config things.
 
 - Removed firebase and fabric.

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

@@ -44,10 +44,11 @@ class AddSourceActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_add_source)
 
-        // TODO: input bubble cursor
-        Scoop.getInstance()
-            .bind(this, Toppings.PRIMARY.value, toolbar)
-            .bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, toolbar)
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        }
 
         val drawable = nameInput.background
         drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)

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

@@ -6,6 +6,7 @@ import android.content.SharedPreferences
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v4.view.MenuItemCompat
@@ -167,8 +168,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     }
 
     private fun handleGDPRDialog(GDPRShown: Boolean) {
+        val sharedEditor = sharedPref.edit()
         if (!GDPRShown) {
-            val sharedEditor = sharedPref.edit()
             val alertDialog = AlertDialog.Builder(this).create()
             alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
             alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
@@ -183,6 +184,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             )
             alertDialog.show()
         }
+
+        if (sharedPref.getString("acra.user.email", "").isNotEmpty()) {
+            sharedEditor.remove("acra.user.email");
+            sharedEditor.commit();
+        }
     }
 
     private fun handleSwipeRefreshLayout() {
@@ -384,16 +390,21 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     }
 
     private fun handleThemeBinding() {
-        Scoop.getInstance()
-            .bind(this, Toppings.PRIMARY.value, toolBar)
-            .bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        }
     }
 
     private fun handleThemeUpdate() {
 
-        Scoop.getInstance()
-            .update(Toppings.PRIMARY.value, appColors.colorPrimary)
-            .update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
+        val scoop = Scoop.getInstance()
+        scoop.update(Toppings.PRIMARY.value, appColors.colorPrimary)
+
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
+        }
     }
 
     private fun handleDrawer() {

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

@@ -3,6 +3,7 @@ package apps.amine.bou.readerforselfoss
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.drawable.ColorDrawable
+import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v4.app.FragmentManager
@@ -62,9 +63,11 @@ class ReaderActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_reader)
 
-        Scoop.getInstance()
-            .bind(this, Toppings.PRIMARY.value, toolBar)
-            .bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        }
 
         setSupportActionBar(toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)

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

@@ -2,6 +2,7 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Intent
 import android.content.res.ColorStateList
+import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
@@ -29,9 +30,11 @@ class SourcesActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_sources)
 
-        Scoop.getInstance()
-            .bind(this, Toppings.PRIMARY.value, toolbar)
-            .bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, toolbar)
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        }
 
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)

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

@@ -1,6 +1,5 @@
 package apps.amine.bou.readerforselfoss.fragments
 
-import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
@@ -20,7 +19,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebSettings
-import apps.amine.bou.readerforselfoss.BuildConfig
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
@@ -86,8 +84,6 @@ class ArticleFragment : Fragment() {
         rootView = inflater
             .inflate(R.layout.fragment_article, container, false) as ViewGroup
 
-        val context: Context = activity!!
-
         url = allItems[pageNumber.toInt()].getLinkDecoded()
         contentText = allItems[pageNumber.toInt()].content
         contentTitle = allItems[pageNumber.toInt()].title
@@ -119,7 +115,7 @@ class ArticleFragment : Fragment() {
             object : FloatingToolbar.ItemClickListener {
                 override fun onItemClick(item: MenuItem) {
                     when (item.itemId) {
-                        R.id.more_action -> getContentFromMercury(customTabsIntent, prefs, context)
+                        R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
                         R.id.share_action -> activity!!.shareLink(url)
                         R.id.open_action -> activity!!.openItemUrl(
                             allItems,
@@ -142,16 +138,16 @@ class ArticleFragment : Fragment() {
         rootView.source.text = contentSource
 
         if (contentText.isEmptyOrNullOrNullString()) {
-            getContentFromMercury(customTabsIntent, prefs, context)
+            getContentFromMercury(customTabsIntent, prefs)
         } else {
             rootView.titleView.text = contentTitle
 
-            htmlToWebview(contentText, prefs, context)
+            htmlToWebview(contentText, prefs)
 
-            if (!contentImage.isEmptyOrNullOrNullString()) {
+            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
                 rootView.imageView.visibility = View.VISIBLE
                 Glide
-                    .with(context)
+                    .with(context!!)
                     .asBitmap()
                     .load(contentImage)
                     .apply(RequestOptions.fitCenterTransform())
@@ -176,8 +172,7 @@ class ArticleFragment : Fragment() {
 
     private fun getContentFromMercury(
         customTabsIntent: CustomTabsIntent,
-        prefs: SharedPreferences,
-        context: Context
+        prefs: SharedPreferences
     ) {
         rootView.progressBar.visibility = View.VISIBLE
         val parser = MercuryApi(
@@ -197,33 +192,39 @@ class ArticleFragment : Fragment() {
                                 rootView.titleView.text = response.body()!!.title
                                 url = response.body()!!.url
                             } catch (e: Exception) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
                             }
 
                             try {
-                                htmlToWebview(response.body()!!.content.orEmpty(), prefs, context)
+                                htmlToWebview(response.body()!!.content.orEmpty(), prefs)
                             } catch (e: Exception) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
                             }
 
                             try {
-                                if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty()) {
+                                if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
                                     rootView.imageView.visibility = View.VISIBLE
                                     try {
                                         Glide
-                                            .with(context)
+                                            .with(context!!)
                                             .asBitmap()
                                             .load(response.body()!!.lead_image_url)
                                             .apply(RequestOptions.fitCenterTransform())
                                             .into(rootView.imageView)
                                     } catch (e: Exception) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
                                     }
                                 } else {
                                     rootView.imageView.visibility = View.GONE
                                 }
                             } catch (e: Exception) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
                             }
 
                             try {
@@ -231,17 +232,23 @@ class ArticleFragment : Fragment() {
 
                                 rootView.progressBar.visibility = View.GONE
                             } catch (e: Exception) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
                             }
                         } else {
                             try {
                                 openInBrowserAfterFailing(customTabsIntent)
                             } catch (e: Exception) {
-                                ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                                if (context != null) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                                }
                             }
                         }
                     } catch (e: Exception) {
-                        ACRA.getErrorReporter().maybeHandleSilentException(e, context)
+                        if (context != null) {
+                            ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
+                        }
                     }
                 }
 
@@ -253,31 +260,47 @@ class ArticleFragment : Fragment() {
         )
     }
 
-    private fun htmlToWebview(c: String, prefs: SharedPreferences, context: Context) {
-
+    private fun htmlToWebview(c: String, prefs: SharedPreferences) {
         val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
 
         rootView.webcontent.visibility = View.VISIBLE
         val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
-            rootView.webcontent.setBackgroundColor(
-                ContextCompat.getColor(
-                    context,
-                    R.color.dark_webview
+            if (context != null) {
+                rootView.webcontent.setBackgroundColor(
+                    ContextCompat.getColor(
+                        context!!,
+                        R.color.dark_webview
+                    )
                 )
-            )
-            Pair(ContextCompat.getColor(context, R.color.dark_webview_text), ContextCompat.getColor(context, R.color.light_webview_text))
+                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, R.color.light_webview_text))
+            } else {
+                Pair(null, null)
+            }
         } else {
-            rootView.webcontent.setBackgroundColor(
-                ContextCompat.getColor(
-                    context,
-                    R.color.light_webview
+            if (context != null) {
+                rootView.webcontent.setBackgroundColor(
+                    ContextCompat.getColor(
+                        context!!,
+                        R.color.light_webview
+                    )
                 )
-            )
-            Pair(ContextCompat.getColor(context, R.color.light_webview_text), ContextCompat.getColor(context, R.color.dark_webview_text))
+                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.dark_webview_text))
+            } else {
+                Pair(null, null)
+            }
         }
 
-        val stringTextColor = String.format("#%06X", 0xFFFFFF and textColor)
-        val stringBackgroundColor = String.format("#%06X", 0xFFFFFF and backgroundColor)
+        val stringTextColor: String = if (textColor != null) {
+            String.format("#%06X", 0xFFFFFF and textColor)
+        } else {
+            "#000000"
+        }
+
+        val stringBackgroundColor = if (backgroundColor != null) {
+            String.format("#%06X", 0xFFFFFF and backgroundColor)
+        } else {
+            "#FFFFFF"
+        }
 
         rootView.webcontent.settings.useWideViewPort = true
         rootView.webcontent.settings.loadWithOverviewMode = true
@@ -296,8 +319,8 @@ class ArticleFragment : Fragment() {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            if (showMalformedUrl) {
-                val alertDialog = AlertDialog.Builder(context).create()
+            if (showMalformedUrl && context != null) {
+                val alertDialog = AlertDialog.Builder(context!!).create()
                 alertDialog.setTitle("Error")
                 alertDialog.setMessage("You are encountering a bug that I can't solve. Can you please contact me to solve the issue, please ?")
                 alertDialog.setButton(

app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java

@@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss.settings;
 
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
@@ -48,10 +49,11 @@ public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
         AppBarLayout bar = (AppBarLayout) LayoutInflater.from(this).inflate(R.layout.settings_toolbar, root, false);
         Toolbar toolbar = bar.findViewById(R.id.toolbar);
 
-        // TODO: all switches
-        Scoop.getInstance()
-                .bind(this, Toppings.PRIMARY.getValue(), toolbar)
-                .bindStatusBar(this, Toppings.PRIMARY_DARK.getValue());
+        Scoop scoop = Scoop.getInstance();
+        scoop.bind(this, Toppings.PRIMARY.getValue(), toolbar);
+        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.getValue());
+        }
 
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);

app/src/main/res/values-af-rZA/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-ar-rSA/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-da-rDK/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-el-rGR/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-fi-rFI/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -157,7 +157,7 @@
   <string name="gdpr_dialog_message">L\'application ne collecte aucune donnée personnelle. Tous les outils d\'anlytics ont été supprimés. Les rapports d\'erreurs sont maintenant optionnels, ainsi que les logs. N\'oubliez pas que les rapports d\'erreurs sont essentiels pour la résolution des bugs (Vous pouvez configurer toute cela dans Paramètres &gt; Debug).</string>
   <string name="gdpr_dialog_title">L\'application ne partage aucune de vos données.</string>
   <string name="crash_dialog_text">Quelque chose s\'est mal passé, S\'il vous plaît, envoyez le rapport au développeur.</string>
-  <string name="crash_dialog_comment">Vous pouvez ajouter tous les détails utiles dans le champ de commentaire plus bas.</string>
+  <string name="crash_dialog_comment">Vous pouvez ajouter tous les détails utiles dans le champ de commentaire plus bas. N\'ajoutez aucune information personnelle. Vous pouvez m\'envoyer un email avec votre identifiant de debug, et je vous informerai à la correction du problème.</string>
   <string name="pref_acra_user_email">Email de contact</string>
   <string name="pref_acra_user_email_summary">Ajoutez un mail pour que le développeur puisse vous contacter pour résoudre le problème.</string>
   <string name="pref_acra_alwaysaccept">Envoyer automatiquement les rapports d\'erreur</string>

app/src/main/res/values-hu-rHU/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-in-rID/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-iw-rIL/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-no-rNO/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-sr-rSP/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-uk-rUA/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-vi-rVN/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -157,7 +157,7 @@
   <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.</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_user_email">Contact email</string>
   <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
   <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -160,7 +160,7 @@
     <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 > 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.</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_user_email">Contact email</string>
     <string name="pref_acra_user_email_summary">Add an email so I can contact you about the crash reports you send.</string>
     <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>

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

@@ -2,11 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory android:title="@string/pref_debug_crash_reports">
-        <EditTextPreference
-            android:key="acra.user.email"
-            android:summary="@string/pref_acra_user_email_summary"
-            android:title="@string/pref_acra_user_email" />
-
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="acra.alwaysaccept"

build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+BASE_VERSION="1.6"
+TODAYS_VERSION="1"
+
+VERSION="${BASE_VERSION//./}$(date '+%y%m%j')$TODAYS_VERSION"
+
+./version.sh ${VERSION} $@
+
+./publish-version.sh ${VERSION}

version.sh

@@ -1,14 +1,11 @@
 #!/bin/bash
 # You can pass --force as first parameter to force push and tag creation.
-BASE_VERSION="v1.6"
-TODAYS_VERSION="1"
 
-VERSION="${BASE_VERSION}.$(date '+%y%m%j')$TODAYS_VERSION"
+echo "Creating tag $@"
 
-echo "Creating tag $VERSION"
-
-git tag $VERSION $1
+TAG="v$@"
+git tag ${TAG}
 
 echo "Pushing tag"
 
-git push origin $VERSION $1
+git push origin ${TAG}