Merge remote-tracking branch 'origin/master'

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Next]
 ### Fixed
+- Fix push notifications not working
+
+## [4.2.0-beta2] - 2018-08-21
+### Fixed
 - Fix messages stuck in sending state
 - Fix push notifications not working
 
@@ -503,7 +507,8 @@
 - Fix draft saving on incoming message (#448)
 - Fix crash during sync (#454)
 
-[Next]: https://github.com/kontalk/androidclient/compare/v4.2.0-beta1...HEAD
+[Next]: https://github.com/kontalk/androidclient/compare/v4.2.0-beta2...HEAD
+[4.2.0-beta2]: https://github.com/kontalk/androidclient/compare/v4.2.0-beta1...v4.2.0-beta2
 [4.2.0-beta1]: https://github.com/kontalk/androidclient/compare/v4.1.6...v4.2.0-beta1
 [4.1.6]: https://github.com/kontalk/androidclient/compare/v4.1.5...v4.1.6
 [4.1.5]: https://github.com/kontalk/androidclient/compare/v4.1.4...v4.1.5

app/build.gradle

@@ -223,6 +223,4 @@ else if (project.hasProperty('GOOGLE_PLAY_DEVELOPER_KEY_FILE')) {
     }
 }
 
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Googleplay")) {
-    apply plugin: 'com.google.gms.google-services'
-}
+apply plugin: 'com.google.gms.google-services'

app/src/main/play/en-US/whatsnew

@@ -5,7 +5,7 @@ Help us improve and fix bugs by reporting them on GitHub or discussing them on o
 * Badge indicators for OEMs supporting it
 * Migrate to Firebase Cloud Messaging
 * Upgrade to Smack 4.3
+* Support for notification categories
 * Accepted invitation is no longer required to chat
-* More precise Google Maps location
 * Fix some annoying public key issues
 * Fix several other bugs

build.gradle

@@ -29,8 +29,8 @@ allprojects {
     evaluationDependsOn ":client-common-java"
     ext {
         applicationId = 'org.kontalk'
-        versionCode = 393
-        versionName = '4.2.0-beta1-next'
+        versionCode = 397
+        versionName = '4.2.0-beta2-next'
         minSdkVersion = 15
         targetSdkVersion = 23
         compileSdkVersion = 27

dist/google_play.json

@@ -1,6 +1,6 @@
 {
     "full_description": "<b>Please help us making Kontalk better! E-mail us at [email protected] if you have any issues!! Leaving a negative review won't help a non-profit project! Thank you!</b>\n<i>NOTE: DO NOT INSTALL ON SD CARD!</i>\n\n<b>Follow @kontalknet on Twitter or identi.ca to keep up to date with the latest changes and on service status!</b>\n\nKontalk is a secure instant messenger, allowing you to send and receive text, image and voice messages (other file types coming soon) to and from other Kontalk users completely free of charge (*).\n\n&#8226;&#8195; <b>Your phone number is your ID.</b> No usernames or passwords<br/>\n&#8226;&#8195; <b>It automatically finds other Kontalk users</b> by looking at your address book, making it even easier to start chatting on Kontalk with your friends<br/>\n&#8226;&#8195; <b>End-to-end encryption</b> ensures safe and private conversations, so that only you and the person you are talking to can read them<br/>\n&#8226;&#8195; Your and all phone numbers used on the network are irreversibly encrypted<br/>\n&#8226;&#8195; It supports multiple devices, making it very easy to start chatting on your phone and continue the conversation on your tablet<br/>\n&#8226;&#8195; Based on open standards: XMPP and OpenPGP\n\nKontalk is a completely Open Source community project, with all the source code hosted on GitHub (https://github.com/kontalk), allowing everyone to inspect its security and improve it.\nThe network relies on community donations to keep the infrastructure running, so if you can, please donate on http://kontalk.net/. Even small donations matter.\n\nYou can find all permissions used by the app explained at this page: https://github.com/kontalk/androidclient/wiki/Android-client-permissions\n\n(*) Carrier fees for Internet traffic may apply",
-    "recent_changes": "Registration provider kindly offered by https:\/\/JMP.Chat\nHelp us improve and fix bugs by reporting them on GitHub or discussing them on our forum!\n\n* NEW: Copy multiple messages to clipboard\n* Badge indicators for OEMs supporting it\n* Migrate to Firebase Cloud Messaging\n* Upgrade to Smack 4.3\n* Accepted invitation is no longer required to chat\n* More precise Google Maps location\n* Fix some annoying public key issues\n* Fix several other bugs",
+    "recent_changes": "Registration provider kindly offered by https:\/\/JMP.Chat\nHelp us improve and fix bugs by reporting them on GitHub or discussing them on our forum!\n\n* NEW: Copy multiple messages to clipboard\n* Badge indicators for OEMs supporting it\n* Migrate to Firebase Cloud Messaging\n* Upgrade to Smack 4.3\n* Support for notification categories\n* Accepted invitation is no longer required to chat\n* Fix some annoying public key issues\n* Fix several other bugs",
     "short_description": "A new way of communicating: community-driven instant messaging network.",
     "title": "Kontalk Messenger"
 }