From 7d6bd540d9b49532638687e5da8fb641a8da6e78 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 29 Aug 2019 12:14:01 +0200
Subject: [PATCH] version bump to 2.5.7 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f484990f..56d2bf476 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/build.gradle b/build.gradle
index c68b11888..1863c43f7 100644
--- a/build.gradle
+++ b/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
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
index e8435efdc..2d281a9e2 100644
--- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
+++ b/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)));
     }
 }