Release v2.3.0

Changed the versionCode to be aligned with our versioning.
chandevel · Mar 19, 2017 · 1be4fdf · 1be4fdf
1 parent 550abae
commit 1be4fdf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 66 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,9 @@
+New in 2.3.0 (2017-03-19)
+- Added update checker to notify of new releases.
+- Force new captcha for thread making.
+- Buf fixes.
+
+
 New in 2.2.0 (2016-10-03)
 - Add sliding of threads back.
 - Rewrote thread watching, it's more stable and works correctly with doze now.

diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle
@@ -21,8 +21,10 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
 
-        versionName "v2.2.0"
-        versionCode 56
+        versionName "v2.3.0"
+        // of the format XXYYZZ, where XX is major, YY is minor, ZZ is patch
+        // (watch out for octal notation, never start with a 0)
+        versionCode 20300
     }
 
     compileOptions {

diff --git a/Clover/app/src/main/java/org/floens/chan/ui/helper/VersionHandler.java b/Clover/app/src/main/java/org/floens/chan/ui/helper/VersionHandler.java
@@ -27,6 +27,7 @@
 import android.text.Spanned;
 import android.widget.Button;
 
+import org.floens.chan.BuildConfig;
 import org.floens.chan.R;
 import org.floens.chan.core.net.UpdateApiRequest;
 import org.floens.chan.core.settings.ChanSettings;
@@ -62,8 +63,11 @@ public class VersionHandler implements UpdateManager.UpdateCallback {
      * 54 = v2.1.2 = 2
      * 55 = v2.1.3 = 2
      * 56 = v2.2.0 = 3
+     * Since v2.3.0, this has been aligned with the versionCode as defined in build.gradle
+     * It is of the format XXYYZZ, where XX is major, YY is minor, ZZ is patch.
+     * 20300 = v2.3.0 = 20300
      */
-    private static final int CURRENT_VERSION = 3;
+    private static final int CURRENT_VERSION = BuildConfig.VERSION_CODE;
 
     /**
      * Context to show dialogs to.
@@ -239,7 +243,7 @@ public void onClick(DialogInterface dialog, int which) {
     }
 
     private void showMessage(int version) {
-        int resource = context.getResources().getIdentifier("previous_version_" + version, "string", context.getPackageName());
+        int resource = context.getResources().getIdentifier("changelog_" + version, "string", context.getPackageName());
         if (resource != 0) {
             CharSequence message = Html.fromHtml(context.getString(resource));
 

diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
@@ -19,73 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Defined in gradle flavor -->
     <!--<string name="app_name">Clover</string>-->
 
-    <string name="previous_version_1">
+    <string name="changelog_20300">
         <![CDATA[
             <h3>Clover was updated</h3>
 
-            This is the beta of Clover v2, redesigned with the Google Material Design guidelines in mind.<br>
-            <br>
-            <b>Biggest changes:</b><br>
-            - New design.<br>
-            - New inline reply layout.<br>
-            - Support for thread hiding.<br>
-            - Support for filtering threads, making posts either highlighted, hidden or completely removed.<br>
-            - Support for history.<br>
-            - More themes were added.<br>
-            - Album downloads have been improved.<br>
-            - Catalog mode now uses cards.<br>
-            - More advanced options added.<br>
-            - Minor features and bug fixes.<br>
-            <br>
-            <b>Please provide feedback on GitHub or by writing an email, links are at the bottom of the settings screen.</b>
-        ]]>
-    </string>
-
-    <string name="previous_version_2">
-        <![CDATA[
-            <h3>Clover was updated</h3>
-
-            This is the release of Clover v2, redesigned with the Material design guidelines in mind.<br>
-            <br>
-            <b>Biggest changes are:</b><br>
-            - New design.<br>
-            - New inline reply layout.<br>
-            - Added thread hiding.<br>
-            - Added filtering threads, making posts either highlighted, hidden or removed.<br>
-            - Added history.<br>
-            - Added more themes.<br>
-            - Better album download screen.<br>
-            - Catalog mode now uses cards.<br>
-            - More advanced options added.<br>
-            - Minor features and bug fixes.<br>
-            <br>
-            <b>Please provide feedback on GitHub or by writing an email, links are at the bottom of the settings screen.</b>
-        ]]>
-    </string>
-
-    <string name="previous_version_3">
-        <![CDATA[
-            <h3>Clover was updated</h3>
-
-            Clover was updated to v2.2.0<br>
+            Clover was updated to v2.3.0<br>
             <br>
             <b>New in this version:</b><br>
-            Add sliding of threads back.<br>
-            Rewrote thread watching, it\'s more stable and works correctly with doze now.<br>
-            Optimized parsing with multithreading.<br>
-            Added album view.<br>
-            Added bookmark clearing.<br>
-            <br>
-            Added inline reporting.<br>
-            All boards are added by default now.<br>
-            Thread positions are retained across restarts.<br>
-            Allow setting of multiple types on filters simultaneously.<br>
-            Made single frame gifs zoomable.<br>
-            Add saving of images into their own board folder.<br>
-            More advanced settings.<br>
-            Many bug fixes.<br>
-            <br>
-            Many thanks to the contributors on GitHub!
+            Added update checker, you\'ll be notified of new releases.<br>
+            Force new captcha for thread making.<br>
+            Bug fixes.
         ]]>
     </string>