version bump to 2.5.7 + changelog

Daniel Gultsch created 6 years ago

Change summary

CHANGELOG.md                                               | 4 ++++
build.gradle                                               | 6 +++---
src/main/java/eu/siacs/conversations/ui/AboutActivity.java | 3 +--
3 files changed, 8 insertions(+), 5 deletions(-)

Detailed changes

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.5.7
+* fixed crash when scanning QR codes on Android 6 and lower
+* when sharing a message from and to Conversations insert it as quote
+
 ### Version 2.5.6
 * fixes for Jingle file transfer
 * fixed some rare crashes

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 
@@ -83,8 +83,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 336
-        versionName "2.5.6"
+        versionCode 337
+        versionName "2.5.7"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId

src/main/java/eu/siacs/conversations/ui/AboutActivity.java

@@ -20,7 +20,6 @@ public class AboutActivity extends AppCompatActivity {
         setContentView(R.layout.activity_about);
         setSupportActionBar(findViewById(R.id.toolbar));
         configureActionBar(getSupportActionBar());
-        setTitle(getString(R.string.title_activity_about_x, getString(R.string.app_name
-        )));
+        setTitle(getString(R.string.title_activity_about_x, getString(R.string.app_name)));
     }
 }