适配API 34

flyun · Dec 3, 2024 · f7fb577 · f7fb577
1 parent ee3e087
commit f7fb577
Show file tree

Hide file tree

Showing 27 changed files with 128 additions and 70 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation 'com.googlecode.mp4parser:isoparser:1.0.6'
     implementation 'com.stripe:stripe-android:2.0.2'
     implementation 'com.google.mlkit:language-id:16.1.1'
-    implementation 'com.android.billingclient:billing:5.1.0'
+    implementation 'com.android.billingclient:billing:6.0.1'
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:31.1-android'
 
@@ -55,7 +55,7 @@ dependencies {
     api 'com.google.firebase:firebase-analytics'
 
     implementation project(':openai_service')
-    annotationProcessor 'org.projectlombok:lombok:1.18.24'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
     implementation project(':markwon-core')
     implementation project(':markwon-ext-tables')
@@ -78,7 +78,7 @@ dependencies {
 
 def isWindows = String.valueOf(DefaultNativePlatform.currentOperatingSystem.toFamilyName() == OperatingSystemFamily.WINDOWS)
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     buildToolsVersion '33.0.0'
     ndkVersion "21.4.7075529"
 
@@ -101,8 +101,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
 
         coreLibraryDesugaringEnabled true
     }
@@ -111,7 +111,7 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionName "8.9.0"
 
         vectorDrawables.generatedDensities = ['mdpi', 'hdpi', 'xhdpi', 'xxhdpi']
@@ -121,7 +121,7 @@ android {
         externalNativeBuild {
             cmake {
                 version '3.10.2'
-                arguments '-DANDROID_STL=c++_static', '-DANDROID_PLATFORM=android-16', "-j=16"
+                arguments '-DANDROID_STL=c++_static', '-DANDROID_PLATFORM=android-16'
             }
         }
     }

diff --git a/TMessagesProj/config/debug/AndroidManifest_SDK23.xml b/TMessagesProj/config/debug/AndroidManifest_SDK23.xml
@@ -18,6 +18,13 @@
 <!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />-->
 <!--    <uses-permission android:name="android.permission.READ_CALL_LOG" />-->
 
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />-->
+
 <!--    <uses-permission android:name="android.permission.READ_CONTACTS" tools:node="remove"/>-->
 <!--    <uses-permission android:name="android.permission.WRITE_CONTACTS" tools:node="remove"/>-->
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove"/>

diff --git a/TMessagesProj/config/release/AndroidManifest_SDK23.xml b/TMessagesProj/config/release/AndroidManifest_SDK23.xml
@@ -28,6 +28,13 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"  tools:node="remove"/>
 
 
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />-->
+
     <application
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"

diff --git a/TMessagesProj/config/release/AndroidManifest_standalone.xml b/TMessagesProj/config/release/AndroidManifest_standalone.xml
@@ -27,6 +27,16 @@
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"  tools:node="remove"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"  tools:node="remove"/>
 
+
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />-->
+
     <application
         android:icon="@mipmap/ic_launcher_sa"
         android:roundIcon="@mipmap/ic_launcher_sa"

diff --git a/TMessagesProj/google-services.json b/TMessagesProj/google-services.json
@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:25984797783:android:c49a53d9ab31179af2e712",
         "android_client_info": {
-          "package_name": "info.flyun.chatair"
+          "package_name": "org.telegram.messenger"
         }
       },
       "oauth_client": [

diff --git a/TMessagesProj_App/build.gradle b/TMessagesProj_App/build.gradle
@@ -23,8 +23,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
+    compileSdkVersion 34
+    buildToolsVersion '34.0.0'
 
     defaultConfig.applicationId = APP_PACKAGE
 
@@ -53,8 +53,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
 
         coreLibraryDesugaringEnabled true
     }
@@ -189,7 +189,7 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionName APP_VERSION_NAME
         ndkVersion "21.4.7075529"
 

diff --git a/TMessagesProj_App/src/main/AndroidManifest.xml b/TMessagesProj_App/src/main/AndroidManifest.xml
@@ -10,11 +10,16 @@
 <!--    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"  tools:node="remove"/>-->
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"  tools:node="remove"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"  tools:node="remove"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" tools:node="remove" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:node="remove" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" tools:node="remove" />-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" tools:node="remove" />-->
 
-    <application android:name="org.telegram.messenger.ApplicationLoaderImpl" tools:replace="name">
-        <service android:name="org.telegram.messenger.GoogleVoiceClientService" android:exported="true"/>
+    <application android:name="info.flyun.chatair.ApplicationLoaderImpl" tools:replace="name">
+        <service android:name="info.flyun.chatair.GoogleVoiceClientService" android:exported="true"/>
         <activity
-            android:name="org.telegram.messenger.GoogleVoiceClientActivity"
+            android:name="info.flyun.chatair.GoogleVoiceClientActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.google.android.voicesearch.SEND_MESSAGE_TO_CONTACTS" />

diff --git a/...gram/messenger/ApplicationLoaderImpl.java → .../flyun/chatair/ApplicationLoaderImpl.java b/...gram/messenger/ApplicationLoaderImpl.java → .../flyun/chatair/ApplicationLoaderImpl.java
@@ -1,5 +1,6 @@
-package org.telegram.messenger;
+package info.flyun.chatair;
 
+import org.telegram.messenger.ApplicationLoader;
 import org.telegram.messenger.regular.BuildConfig;
 
 public class ApplicationLoaderImpl extends ApplicationLoader {

diff --git a/.../messenger/GoogleVoiceClientActivity.java → ...un/chatair/GoogleVoiceClientActivity.java b/.../messenger/GoogleVoiceClientActivity.java → ...un/chatair/GoogleVoiceClientActivity.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2018.
  */
 
-package org.telegram.messenger;
+package info.flyun.chatair;
 
 import com.google.android.search.verification.client.SearchActionVerificationClientActivity;
 import com.google.android.search.verification.client.SearchActionVerificationClientService;

diff --git a/...m/messenger/GoogleVoiceClientService.java → ...yun/chatair/GoogleVoiceClientService.java b/...m/messenger/GoogleVoiceClientService.java → ...yun/chatair/GoogleVoiceClientService.java
@@ -6,13 +6,15 @@
  * Copyright Nikolai Kudashov, 2013-2018.
  */
 
-package org.telegram.messenger;
+package info.flyun.chatair;
 
 import android.content.Intent;
 import android.os.Bundle;
 
 import com.google.android.search.verification.client.SearchActionVerificationClientService;
 
+import org.telegram.messenger.AndroidUtilities;
+
 public class GoogleVoiceClientService extends SearchActionVerificationClientService {
 
     @Override

diff --git a/TMessagesProj_AppHockeyApp/build.gradle b/TMessagesProj_AppHockeyApp/build.gradle
@@ -25,8 +25,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
+    compileSdkVersion 34
+    buildToolsVersion '34.0.0'
 
     defaultConfig.applicationId = APP_PACKAGE
 
@@ -43,8 +43,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
 
         coreLibraryDesugaringEnabled true
     }
@@ -143,7 +143,7 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionName APP_VERSION_NAME
         ndkVersion "21.4.7075529"
 

diff --git a/TMessagesProj_AppHockeyApp/src/main/AndroidManifest.xml b/TMessagesProj_AppHockeyApp/src/main/AndroidManifest.xml
@@ -5,7 +5,10 @@
     android:installLocation="auto">
 
     <application android:name="org.telegram.messenger.ApplicationLoaderImpl" tools:replace="name">
-        <service android:name="org.telegram.messenger.GoogleVoiceClientService" android:exported="true"/>
+        <service android:name="org.telegram.messenger.GoogleVoiceClientService"
+            android:exported="true"/>
+<!--            android:foregroundServiceType="dataSync"-->
+<!--            />-->
         <activity
             android:name="org.telegram.messenger.GoogleVoiceClientActivity"
             android:exported="true">

diff --git a/TMessagesProj_AppHuawei/agconnect-services.json b/TMessagesProj_AppHuawei/agconnect-services.json
@@ -33,15 +33,15 @@
 		"project_id":"9105385871708127577",
 		"app_id":"101184875",
 		"api_key":"DAEDAEehEkTAPVhW2szdQNNLzBVS1Re7Pw98QkLMvgGZaEEUc8JLBVi2qhMh2vWw9h/Yq2PwtSGxZzFrSmLAQIysf7Tvo4BAadcblA==",
-		"package_name":"org.telegram.messenger"
+		"package_name":"info.flyun.chatair"
 	},
 	"oauth_client":{
 		"client_id":"101184875",
 		"client_type":1
 	},
 	"app_info":{
 		"app_id":"101184875",
-		"package_name":"org.telegram.messenger"
+		"package_name":"info.flyun.chatair"
 	},
 	"service":{
 		"analytics":{
@@ -75,12 +75,12 @@
 	"configuration_version":"3.0",
 	"appInfos":[
 		{
-			"package_name":"org.telegram.messenger",
+			"package_name":"info.flyun.chatair",
 			"client":{
 				"app_id":"101184875"
 			},
 			"app_info":{
-				"package_name":"org.telegram.messenger",
+				"package_name":"info.flyun.chatair",
 				"app_id":"101184875"
 			},
 			"oauth_client":{

diff --git a/TMessagesProj_AppHuawei/build.gradle b/TMessagesProj_AppHuawei/build.gradle
@@ -29,8 +29,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
+    compileSdkVersion 34
+    buildToolsVersion '34.0.0'
 
     defaultConfig.applicationId = APP_PACKAGE
 
@@ -47,8 +47,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
 
         coreLibraryDesugaringEnabled true
     }
@@ -137,7 +137,7 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionName APP_VERSION_NAME
         ndkVersion "21.4.7075529"
 

diff --git a/TMessagesProj_AppHuawei/src/main/AndroidManifest.xml b/TMessagesProj_AppHuawei/src/main/AndroidManifest.xml
@@ -11,7 +11,10 @@
     </queries>
 
     <application android:name="org.telegram.messenger.HuaweiApplicationLoader" tools:replace="name">
-        <service android:name="org.telegram.messenger.GoogleVoiceClientService" android:exported="true"/>
+        <service android:name="org.telegram.messenger.GoogleVoiceClientService"
+            android:exported="true"/>
+<!--            android:foregroundServiceType="dataSync"-->
+<!--            />-->
         <activity
             android:name="org.telegram.messenger.GoogleVoiceClientActivity"
             android:exported="true">

diff --git a/base/build.gradle b/base/build.gradle
@@ -9,12 +9,12 @@ repositories {
 
 dependencies {
 
-    compileOnly 'org.projectlombok:lombok:1.18.24'
-    annotationProcessor 'org.projectlombok:lombok:1.18.24'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
 }
 
 java {
-    targetCompatibility JavaVersion.VERSION_1_8
-    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_11
+    sourceCompatibility JavaVersion.VERSION_11
 }
diff --git a/build.gradle b/build.gradle
@@ -6,10 +6,10 @@ buildscript {
         maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
-        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.301'
     }
 }
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -13,8 +13,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Sat Mar 12 05:53:50 MSK 2016
-APP_VERSION_CODE=14
-APP_VERSION_NAME=1.1.4
+APP_VERSION_CODE=19
+APP_VERSION_NAME=1.1.9
 APP_PACKAGE=info.flyun.chatair
 RELEASE_KEY_PASSWORD=android
 RELEASE_KEY_ALIAS=androidkey

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
diff --git a/markwon-core/build.gradle b/markwon-core/build.gradle
@@ -2,15 +2,19 @@ apply plugin: 'com.android.library'
 
 android {
 
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 34
+    buildToolsVersion '34.0.0'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 1
         versionName version
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }
 
 repositories {