From 89ba17150d4056a5cb4ef4171e9ccdfe7d1a4fee Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 4 Dec 2018 21:42:00 +0100
Subject: version 2.1.5 beta (2018-12-04)

---
 CHANGELOG.md                                  | 8 ++++++++
 build.gradle                                  | 8 ++++----
 src/main/java/de/pixart/messenger/Config.java | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90144f9fd..16cfdc30b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ### Changelog
 
+#### Version 2.1.5
+* improved handling of bookmark nicks
+* long press on 'allow' or 'add back' snackbar to bring up 'reject'
+* let the user forbid android from taking screenshots
+* make PEP avatars public to play nice with Prosody 0.11
+* fixed re-sending failed files in group chats
+* bug fixes
+
 #### Version 2.1.4
 * fix crash with xmpp uris
  
diff --git a/build.gradle b/build.gradle
index 914b8b69d..ee0e87fdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,7 @@ dependencies {
     implementation 'org.gnu.inet:libidn:1.15'
     implementation 'com.google.zxing:core:3.3.0'
     implementation 'de.measite.minidns:minidns-hla:0.2.4'
-    implementation 'me.leolin:ShortcutBadger:1.1.21@aar'
+    implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
     implementation 'org.whispersystems:signal-protocol-java:2.6.2'
     implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation 'jetty:javax.servlet:5.1.12'
@@ -95,10 +95,10 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
 
-        versionCode 247
-        versionName "2.1.4"
+        versionCode 249
+        versionName "2.1.5 beta (2018-12-04)"
 
         archivesBaseName += "-$versionName"
         applicationId "de.pixart.messenger"
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 68ab52590..ce65587b7 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -104,7 +104,7 @@ public final class Config {
 
     public static final int REFRESH_UI_INTERVAL = 500;
 
-    public static final long OMEMO_AUTO_EXPIRY = 7 * MILLISECONDS_IN_DAY; // delete old OMEMO devices after 7 days od inactivity
+    public static final long OMEMO_AUTO_EXPIRY = 7 * MILLISECONDS_IN_DAY; // delete old OMEMO devices after 7 days of inactivity
     public static final boolean REMOVE_BROKEN_DEVICES = false;
     public static final boolean OMEMO_PADDING = false;
     public static final boolean PUT_AUTH_TAG_INTO_KEY = true;
-- 
cgit v1.2.3