From d32be8ae19068be9683d166407521415d5772192 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 20 Oct 2018 23:17:33 +0200
Subject: fix some build errors

---
 CHANGELOG.md                                          | 1 +
 build.gradle                                          | 2 --
 src/main/java/de/pixart/messenger/utils/Resolver.java | 4 +++-
 src/main/res/values-fil/strings.xml                   | 4 ++--
 src/main/res/values-id/strings.xml                    | 4 ++--
 src/main/res/values-w384dp/dimens.xml                 | 1 -
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1854a2cb..1b00b30f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * enable foreground service by default for Android 8 (notification can be disabled by long pressing it)
 * reworked MediaViewer
 * support TLSv1.3 (ejabberd ≤ 18.06 is incompatible with openssl 1.1.1 - Update ejabberd or downgrade openssl if you get ›Stream opening error‹)
+* add push messages for playstore versions
 * bug fixes
 
 #### Version 2.1.0
diff --git a/build.gradle b/build.gradle
index 0aee2fd96..1ac3b4e16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,7 +128,6 @@ android {
     productFlavors {
         standardPush {
             dimension "distribution"
-            versionNameSuffix "+p"
         }
         standard
     }
@@ -168,7 +167,6 @@ android {
 
     lintOptions {
         disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
-        checkReleaseBuilds false
     }
 
     subprojects {
diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java
index 7817e7914..f2716a648 100644
--- a/src/main/java/de/pixart/messenger/utils/Resolver.java
+++ b/src/main/java/de/pixart/messenger/utils/Resolver.java
@@ -63,7 +63,9 @@ public class Resolver {
             final Field useHardcodedDnsServers = DNSClient.class.getDeclaredField("useHardcodedDnsServers");
             useHardcodedDnsServers.setAccessible(true);
             useHardcodedDnsServers.setBoolean(dnsClient, false);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
+        } catch (NoSuchFieldException e) {
+            Log.e(Config.LOGTAG, "Unable to disable hardcoded DNS servers", e);
+        } catch (IllegalAccessException e) {
             Log.e(Config.LOGTAG, "Unable to disable hardcoded DNS servers", e);
         }
     }
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index fe40ec093..4b427d4b6 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -169,7 +169,7 @@
   <string name="passwords_do_not_match">Ang password ay hindi magkatugma</string>
   <string name="invalid_jid">Hindi ito balido na Jabber-ID</string>
   <string name="error_out_of_memory">Wala ng memorya. Ang imahe ay napakalaki</string>
-  <string name="add_phone_book_text">Gusto mo bang magdagdag sa iyong address book?</string>
+  <string name="add_phone_book_text">Gusto mo bang %s magdagdag sa iyong address book?</string>
   <string name="server_info_show_more">Impormasyon sa server</string>
   <string name="server_info_mam">XEP-0313: MAM</string>
   <string name="server_info_carbon_messages">XEP-0280: Mensagheng karbon</string>
@@ -185,7 +185,7 @@
   <string name="missing_public_keys">Nawalang public key na mga anunsyo</string>
   <string name="last_seen_now">online</string>
   <string name="last_seen_min">1 minutong nakalipas</string>
-  <string name="last_seen_mins">minutong nakalipas</string>
+  <string name="last_seen_mins">%d minutong nakalipas</string>
   <string name="last_seen_hour">1 oras na ang nakalipas</string>
   <string name="last_seen_hours">%d oras na nakalipas</string>
   <string name="last_seen_day">1 araw na nakalipas</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index f675b61b0..6171a8110 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -78,7 +78,7 @@
   <string name="also_end_conversation">Akhiri pembicaraan setelahnya</string>
   <string name="choose_presence">Pilih perangkat</string>
   <string name="send_unencrypted_message">Kirim pesan tidak terenkripsi</string>
-  <string name="send_message_to_x">Kirim pesan ke% s</string>
+  <string name="send_message_to_x">Kirim pesan ke %s</string>
   <string name="send_otr_message">Kirim pesan terenkripsi OTR</string>
   <string name="send_omemo_message">Kirim pesan terenkripsi OMEMO</string>
   <string name="send_omemo_x509_message">Kirim pesan terenkripsi v\\OMEMO</string>
@@ -282,7 +282,7 @@
   <string name="conference_members_only">Obrolan kelompok ini hanya untuk anggota saja</string>
   <string name="conference_kicked">Anda telah dikeluarkan dari obrolan kelompok ini</string>
   <string name="conference_shutdown">Obrolan kelompok dimatikan</string>
-  <string name="using_account">menggunakan akun% s</string>
+  <string name="using_account">menggunakan akun %s</string>
   <string name="checking_x">Memeriksa %s di HTTP host</string>
   <string name="not_connected_try_again">Anda tidak dapat terhubung. Coba lagi nanti</string>
   <string name="check_x_filesize">Periksa %s ukuran</string>
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
index a04ce6763..9a6c0b106 100644
--- a/src/main/res/values-w384dp/dimens.xml
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -1,7 +1,6 @@
 <resources>
     <!-- 384dp is the screen width of the Nexus 4. Something like a Moto G is smaller but a Nexus 5X is larger -->
     <!-- https://material.io/devices/ -->
-    <dimen name="fineprint_size">12sp</dimen>
     <dimen name="audio_player_width">288dp</dimen>
     <dimen name="avatar_on_details_screen_size">72dp</dimen>
     <dimen name="media_size">64dp</dimen> <!-- ideally not larger than avatar_on_details_screen -->
-- 
cgit v1.2.3