From a4aa5f80999d708ce1e5298e6f2b18eec542acca Mon Sep 17 00:00:00 2001
From: luvletter2333 <luvletter2333@gmail.com>
Date: Tue, 1 Nov 2022 17:51:10 +0800
Subject: [PATCH] upgrade dependencies

---
 TMessagesProj/build.gradle                    | 48 +++++++------
 .../src/gservcies/AndroidManifest.xml         |  1 -
 TMessagesProj/src/main/AndroidManifest.xml    | 68 ++++++++++---------
 build.gradle                                  |  8 +--
 gradle.properties                             |  3 +-
 openpgp-api/build.gradle                      |  8 +--
 openpgp-api/src/main/AndroidManifest.xml      |  3 +-
 ss-rust/build.gradle.kts                      |  1 +
 ss-rust/src/main/AndroidManifest.xml          |  3 +-
 ssr-libev/build.gradle                        |  3 +-
 ssr-libev/src/main/AndroidManifest.xml        |  3 +-
 11 files changed, 72 insertions(+), 77 deletions(-)

diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index cb14bce82..ef285ed8c 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -72,7 +72,7 @@ def nativeTarget = System.getenv("NATIVE_TARGET")
 if (nativeTarget == null) nativeTarget = ""
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
     buildToolsVersion "31.0.0"
     ndkVersion rootProject.ext.ndkVersion
 
@@ -99,7 +99,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
-        targetSdkVersion 30
+        targetSdkVersion 32
 
         versionName verName
         versionCode verCode
@@ -123,7 +123,7 @@ android {
         externalNativeBuild {
             cmake {
                 version "3.10.2"
-                arguments "-DANDROID_STL=c++_static", "-DANDROID_PLATFORM=android-16", "-j=${Runtime.getRuntime().availableProcessors()}"
+                arguments "-DANDROID_STL=c++_static", "-DANDROID_PLATFORM=android-16"
             }
         }
 
@@ -141,24 +141,6 @@ android {
         }
     }
 
-    lintOptions {
-        disable "MissingTranslation"
-        disable "ExtraTranslation"
-        disable "BlockedPrivateApi"
-    }
-
-    packagingOptions {
-
-        exclude "/fabric/**"
-        exclude "/META-INF/*.version"
-        exclude "/META-INF/*.kotlin_module"
-        exclude "/META-INF/native-image/**"
-        exclude "/builddef.lst"
-        exclude "/*.txt"
-        exclude "/DebugProbesKt.bin"
-        exclude "/okhttp3/internal/publicsuffix/NOTICE"
-
-    }
 
     dexOptions {
         jumboMode = true
@@ -352,7 +334,9 @@ dependencies {
     implementation "androidx.interpolator:interpolator:1.0.0"
     implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
     implementation "androidx.multidex:multidex:2.0.1"
-    implementation "androidx.sharetarget:sharetarget:1.1.0"
+    implementation "androidx.sharetarget:sharetarget:1.2.0"
+    implementation "androidx.emoji2:emoji2:1.2.0"
+    implementation 'androidx.emoji2:emoji2-bundled:1.2.0'
 
     compileOnly "org.checkerframework:checker-qual:3.16.0"
     compileOnly "org.checkerframework:checker-compat-qual:2.5.5"
@@ -363,8 +347,8 @@ dependencies {
 
     implementation "com.google.code.gson:gson:2.8.8"
     implementation "org.osmdroid:osmdroid-android:6.1.10"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1"
 
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
     implementation 'dnsjava:dnsjava:3.4.1'
@@ -402,7 +386,7 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "org.robolectric:robolectric:4.5.1"
 
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.0"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.2.0"
 
 }
 
@@ -411,6 +395,20 @@ apply plugin: "com.google.firebase.crashlytics"
 
 android {
 
+
+    packagingOptions {
+        jniLibs {
+            excludes += ['/fabric/**', '/META-INF/native-image/**']
+        }
+        resources {
+            excludes += ['/fabric/**', '/META-INF/*.version', '/META-INF/*.kotlin_module', '/META-INF/native-image/**', '/builddef.lst', '/*.txt', '/DebugProbesKt.bin', '/okhttp3/internal/publicsuffix/NOTICE']
+        }
+    }
+    namespace "org.telegram.messenger"
+    lint {
+        disable 'MissingTranslation', 'ExtraTranslation', 'BlockedPrivateApi'
+    }
+
     tasks.all { task ->
         if (task.name.startsWith("uploadCrashlyticsMappingFile")) {
             task.enabled = false
diff --git a/TMessagesProj/src/gservcies/AndroidManifest.xml b/TMessagesProj/src/gservcies/AndroidManifest.xml
index 669fa01d2..e0ea9d2fe 100644
--- a/TMessagesProj/src/gservcies/AndroidManifest.xml
+++ b/TMessagesProj/src/gservcies/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.telegram.messenger"
     android:installLocation="auto">
 
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
index 1e3d40411..21a530ee0 100644
--- a/TMessagesProj/src/main/AndroidManifest.xml
+++ b/TMessagesProj/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-    package="org.telegram.messenger"
     android:installLocation="auto">
 
     <queries>
@@ -13,6 +12,7 @@
         </intent>
     </queries>
 
+
     <uses-sdk tools:overrideLibrary="io.nekohasekai.ss_rust,io.nekohasekai.ssr_libev" />
 
     <supports-screens android:anyDensity="true"
@@ -99,7 +99,9 @@
     <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_READ"/>
     <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE"/>
     <uses-permission android:name="com.android.vending.BILLING"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="replace" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:node="replace" />
 
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
@@ -117,11 +119,11 @@
         android:largeHeap="true"
         android:manageSpaceActivity="org.telegram.ui.ExternalActionActivity"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:requestLegacyExternalStorage="true"
-        android:preserveLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="false"
-        android:theme="@style/Theme.TMessages.Start"
+        android:requestLegacyExternalStorage="true"
+        android:hasFragileUserData="true"
+        android:preserveLegacyExternalStorage="true"
         android:allowAudioPlaybackCapture="true"
         tools:replace="android:supportsRtl">
 
@@ -219,7 +221,8 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:hardwareAccelerated="@bool/useHardwareAcceleration"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -300,7 +303,8 @@
         <activity-alias
             android:name="org.telegram.ui.CallsActivity"
             android:targetActivity="org.telegram.ui.LaunchActivity"
-            android:permission="android.permission.CALL_PHONE">
+            android:permission="android.permission.CALL_PHONE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -323,7 +327,8 @@
             android:windowSoftInputMode="adjustPan"
             android:excludeFromRecents="true"
             android:stateNotNeeded="true"
-            android:theme="@style/Theme.TMessages.Transparent">
+            android:theme="@style/Theme.TMessages.Transparent"
+            android:exported="true">
             <intent-filter android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" android:priority="1">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -335,7 +340,8 @@
             android:name="org.telegram.ui.ExternalActionActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:hardwareAccelerated="@bool/useHardwareAcceleration"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher">
                 <action android:name="org.telegram.passport.AUTHORIZE"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -345,7 +351,8 @@
             android:name="org.telegram.ui.ChatsWidgetConfigActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:hardwareAccelerated="@bool/useHardwareAcceleration"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round">
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
@@ -354,27 +361,18 @@
             android:name="org.telegram.ui.ContactsWidgetConfigActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:hardwareAccelerated="@bool/useHardwareAcceleration"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round">
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="org.telegram.ui.ShortcutWidgetConfigActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-            android:hardwareAccelerated="@bool/useHardwareAcceleration"
-            android:windowSoftInputMode="adjustPan">
-            <intent-filter
-                android:icon="@mipmap/ic_launcher"
-                android:roundIcon="@mipmap/ic_launcher">
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="org.telegram.ui.FeedWidgetConfigActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:hardwareAccelerated="@bool/useHardwareAcceleration"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter
                 android:icon="@mipmap/ic_launcher"
                 android:roundIcon="@mipmap/ic_launcher">
@@ -439,7 +437,8 @@
         <!--    </intent-filter>-->
         <!--</receiver>-->
 
-        <receiver android:name=".CallReceiver">
+        <receiver android:name=".CallReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.PHONE_STATE"/>
             </intent-filter>
@@ -490,13 +489,15 @@
 <!--                <action android:name="android.service.notification.NotificationListenerService" />-->
 <!--            </intent-filter>-->
 <!--        </service>-->
-        <service android:name=".voip.TelegramConnectionService" android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
+        <service android:name=".voip.TelegramConnectionService"
+            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.telecom.ConnectionService" />
             </intent-filter>
         </service>
 
-        <receiver android:name=".MusicPlayerReceiver" >
+        <receiver android:name=".MusicPlayerReceiver" android:exported="true" >
             <intent-filter>
                 <action android:name="org.telegram.android.musicplayer.close" />
                 <action android:name="org.telegram.android.musicplayer.pause" />
@@ -513,7 +514,7 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".AppStartReceiver" android:enabled="true">
+        <receiver android:name=".AppStartReceiver" android:enabled="true" android:exported="true">
             <intent-filter>
                 <action android:name="org.telegram.start" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -526,17 +527,17 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".WearReplyReceiver" android:enabled="true"/>
+        <receiver android:name=".WearReplyReceiver" android:enabled="true" android:exported="false"/>
 
-        <receiver android:name=".StopLiveLocationReceiver" android:enabled="true"/>
+        <receiver android:name=".StopLiveLocationReceiver" android:enabled="true" android:exported="false"/>
 
-        <receiver android:name=".PopupReplyReceiver" android:enabled="true"/>
+        <receiver android:name=".PopupReplyReceiver" android:enabled="true" android:exported="false"/>
 
         <receiver android:name=".NotificationCallbackReceiver" android:enabled="true" android:exported="false"/>
 
-        <receiver android:name=".ShareBroadcastReceiver" android:enabled="true"/>
+        <receiver android:name=".ShareBroadcastReceiver" android:enabled="true" android:exported="false"/>
 
-        <receiver android:name=".CustomTabsCopyReceiver" android:enabled="true"/>
+        <receiver android:name=".CustomTabsCopyReceiver" android:enabled="true" android:exported="false"/>
 
         <receiver android:name=".NotificationDismissReceiver" android:exported="false"/>
 
@@ -587,7 +588,8 @@
             android:permission="android.permission.BIND_REMOTEVIEWS"
             android:exported="false" />
 
-        <receiver android:name=".FeedWidgetProvider">
+        <receiver android:name=".FeedWidgetProvider"
+            android:exported="true">
             <meta-data android:name="android.appwidget.provider"
                 android:resource="@xml/feed_widget_info" />
             <intent-filter>
diff --git a/build.gradle b/build.gradle
index b05f05ea6..fcf4f05e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,10 +6,10 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30'
-        classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.9.0'
         //noinspection GradleDependency
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
diff --git a/gradle.properties b/gradle.properties
index 9b871000a..a14119af4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,5 +20,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=false
 android.useAndroidX=true
-android.enableJetifier=true
-android.bundle.enableUncompressedNativeLibs=false
\ No newline at end of file
+android.enableJetifier=true
\ No newline at end of file
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
index 7284a80c7..f389935ee 100644
--- a/openpgp-api/build.gradle
+++ b/openpgp-api/build.gradle
@@ -4,14 +4,14 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        versionCode 9
-        versionName '13.0' // API-Version . minor
+        // API-Version . minor
         minSdkVersion 19
         targetSdkVersion 31
     }
 
-    lintOptions {
+    buildToolsVersion '31.0.0'
+    lint {
         abortOnError false
     }
-    buildToolsVersion '31.0.0'
+    namespace 'org.openintents.openpgp'
 }
\ No newline at end of file
diff --git a/openpgp-api/src/main/AndroidManifest.xml b/openpgp-api/src/main/AndroidManifest.xml
index f1f29cf3c..a861a9c67 100644
--- a/openpgp-api/src/main/AndroidManifest.xml
+++ b/openpgp-api/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.openintents.openpgp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application/>
 
diff --git a/ss-rust/build.gradle.kts b/ss-rust/build.gradle.kts
index 345705023..2ef4f3c4f 100644
--- a/ss-rust/build.gradle.kts
+++ b/ss-rust/build.gradle.kts
@@ -27,6 +27,7 @@ android {
         targetSdk = 31
     }
     buildToolsVersion = "31.0.0"
+    namespace = "io.nekohasekai.ss_rust"
 
     if (targetAbi.isNotBlank()) splits.abi {
         reset()
diff --git a/ss-rust/src/main/AndroidManifest.xml b/ss-rust/src/main/AndroidManifest.xml
index b3695aad8..972c3a837 100644
--- a/ss-rust/src/main/AndroidManifest.xml
+++ b/ss-rust/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.nekohasekai.ss_rust">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/ssr-libev/build.gradle b/ssr-libev/build.gradle
index 1a136ace3..2771ccc00 100644
--- a/ssr-libev/build.gradle
+++ b/ssr-libev/build.gradle
@@ -25,8 +25,6 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         externalNativeBuild {
             ndkBuild {
@@ -52,5 +50,6 @@ android {
             path 'src/main/jni/Android.mk'
         }
     }
+    namespace 'io.nekohasekai.ssr_libev'
 
 }
\ No newline at end of file
diff --git a/ssr-libev/src/main/AndroidManifest.xml b/ssr-libev/src/main/AndroidManifest.xml
index 8462535df..972c3a837 100644
--- a/ssr-libev/src/main/AndroidManifest.xml
+++ b/ssr-libev/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.nekohasekai.ssr_libev">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file