Change summary
build.gradle | 11 ++++++-----
src/conversations/AndroidManifest.xml | 9 ++++-----
src/playstore/AndroidManifest.xml | 24 ++++++++++++++----------
3 files changed, 24 insertions(+), 20 deletions(-)
Detailed changes
@@ -33,7 +33,7 @@ configurations {
dependencies {
implementation 'androidx.viewpager:viewpager:1.0.0'
- playstoreImplementation('com.google.firebase:firebase-messaging:23.0.6') {
+ playstoreImplementation('com.google.firebase:firebase-messaging:23.0.7') {
exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics'
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -42,14 +42,14 @@ dependencies {
quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
implementation 'org.sufficientlysecure:openpgp-api:10.0'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
- implementation 'androidx.appcompat:appcompat:1.4.2'
+ implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'androidx.exifinterface:exifinterface:1.3.3'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'com.google.android.material:material:1.4.0'
- implementation "androidx.emoji2:emoji2:1.1.0"
- freeImplementation "androidx.emoji2:emoji2-bundled:1.1.0"
+ implementation "androidx.emoji2:emoji2:1.2.0"
+ freeImplementation "androidx.emoji2:emoji2-bundled:1.2.0"
implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
//zxing stopped supporting Java 7 so we have to stick with 3.3.3
@@ -75,7 +75,8 @@ dependencies {
implementation 'com.google.guava:guava:30.1.1-android'
quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.49'
- implementation 'ch.threema:webrtc-android:100.0.0'
+ freeImplementation 'ch.threema:webrtc-android:100.0.0'
+ playstoreImplementation fileTree(include: ['libwebrtc-m104.aar'], dir: 'libs')
}
ext {
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
- <application tools:ignore="GoogleAppIndexingWarning">
+ <application android:icon="@mipmap/new_launcher">
<activity
android:name=".ui.ManageAccountActivity"
android:label="@string/title_activity_manage_accounts"
@@ -25,9 +24,9 @@
android:launchMode="singleTask" />
<activity
android:name=".ui.ImportBackupActivity"
+ android:exported="true"
android:label="@string/restore_backup"
- android:launchMode="singleTask"
- android:exported="true">
+ android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1,23 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
- <application tools:ignore="GoogleAppIndexingWarning">
+ <application android:icon="@mipmap/new_launcher">
- <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
- <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+ <meta-data
+ android:name="firebase_analytics_collection_deactivated"
+ android:value="true" />
+ <meta-data
+ android:name="google_analytics_adid_collection_enabled"
+ android:value="false" />
- <receiver android:name=".services.MaintenanceReceiver"
- android:exported="true"
- android:permission="android.permission.CHANGE_CONFIGURATION">
+ <receiver
+ android:name=".services.MaintenanceReceiver"
+ android:exported="true"
+ android:permission="android.permission.CHANGE_CONFIGURATION">
<intent-filter>
- <action android:name="eu.siacs.conversations.RENEW_INSTANCE_ID"/>
+ <action android:name="eu.siacs.conversations.RENEW_INSTANCE_ID" />
</intent-filter>
</receiver>
<service
android:name=".services.PushMessageReceiver"
- android:exported="false" >
+ android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>