diff --git a/CHANGES.txt b/CHANGES.txt
index eaeef830..5906e644 100644
--- 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
index aefdaebb..cfd47174 100644
--- 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
index 75f04477..4c17b1c3 100644
--- 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.Html;
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 class VersionHandler implements UpdateManager.UpdateCallback {
}
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
index 1588b3f3..ee207c29 100644
--- 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 .
-
+
Clover was updated
- This is the beta of Clover v2, redesigned with the Google Material Design guidelines in mind.
-
- Biggest changes:
- - New design.
- - New inline reply layout.
- - Support for thread hiding.
- - Support for filtering threads, making posts either highlighted, hidden or completely removed.
- - Support for history.
- - More themes were added.
- - Album downloads have been improved.
- - Catalog mode now uses cards.
- - More advanced options added.
- - Minor features and bug fixes.
-
- Please provide feedback on GitHub or by writing an email, links are at the bottom of the settings screen.
- ]]>
-
-
-
- Clover was updated
-
- This is the release of Clover v2, redesigned with the Material design guidelines in mind.
-
- Biggest changes are:
- - New design.
- - New inline reply layout.
- - Added thread hiding.
- - Added filtering threads, making posts either highlighted, hidden or removed.
- - Added history.
- - Added more themes.
- - Better album download screen.
- - Catalog mode now uses cards.
- - More advanced options added.
- - Minor features and bug fixes.
-
- Please provide feedback on GitHub or by writing an email, links are at the bottom of the settings screen.
- ]]>
-
-
-
- Clover was updated
-
- Clover was updated to v2.2.0
+ Clover was updated to v2.3.0
New in this version:
- Add sliding of threads back.
- Rewrote thread watching, it\'s more stable and works correctly with doze now.
- Optimized parsing with multithreading.
- Added album view.
- Added bookmark clearing.
-
- Added inline reporting.
- All boards are added by default now.
- Thread positions are retained across restarts.
- Allow setting of multiple types on filters simultaneously.
- Made single frame gifs zoomable.
- Add saving of images into their own board folder.
- More advanced settings.
- Many bug fixes.
-
- Many thanks to the contributors on GitHub!
+ Added update checker, you\'ll be notified of new releases.
+ Force new captcha for thread making.
+ Bug fixes.
]]>