Merge pull request #75 from hazmi-e205/android14_support

feat: Android 14 Support added
SonicCloudOrg · Feb 23, 2024 · c67453a · c67453a
2 parents 2db215e + f6a4e6f
commit c67453a
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 28 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -9,10 +9,10 @@ jobs:
 
  steps:
  - uses: actions/checkout@v2
- - name: set up JDK 11
+ - name: set up JDK 17
  uses: actions/setup-java@v2
  with:
- java-version: '11'
+ java-version: '17'
  distribution: 'temurin'
  cache: gradle
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -26,10 +26,10 @@ jobs:
  uses: "WyriHaximus/github-action-get-previous-tag@v1"
  - name: replace version
  run: ver=${{ steps.previoustag.outputs.tag }} && new_ver=${ver:1} && sed -i "s/SONIC_VERSION/${new_ver}/g" app/build.gradle
- - name: set up JDK 11
+ - name: set up JDK 17
  uses: actions/setup-java@v2
  with:
- java-version: '11'
+ java-version: '17'
  distribution: 'temurin'
  cache: gradle
  - name: Grant execute permission for gradlew

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,13 @@ plugins {
 }
 
 android {
- compileSdk 31
+ compileSdk 34
+ namespace "org.cloud.sonic.android"
 
  defaultConfig {
  applicationId "org.cloud.sonic.android"
  minSdk 21
- targetSdk 31
+ targetSdk 34
  versionCode 10
  versionName "SONIC_VERSION"
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
- xmlns:tools="http:https://schemas.android.com/tools"
- package="org.cloud.sonic.android">
+ xmlns:tools="http:https://schemas.android.com/tools">
 
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 获取wifi需要 -->
  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -23,8 +21,6 @@
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
  <uses-permission
  android:name="android.permission.QUERY_ALL_PACKAGES"
  tools:ignore="QueryAllPackagesPermission" />
@@ -33,7 +29,10 @@
  tools:ignore="ProtectedPermissions" />
  <uses-permission android:name="android.permission.BLUETOOTH" />
  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+ <!-- Needed for Android 14 (API level 34) -->
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
 
  <application
  android:name=".App"
@@ -98,7 +97,8 @@
 
  <service
  android:name=".service.SonicManagerServiceV2"
- android:exported="true" />
+ android:exported="true"
+ android:foregroundServiceType="mediaPlayback" />
 
  <service
  android:name=".plugin.SonicPluginAudioService"

diff --git a/app/src/main/java/org/cloud/sonic/android/keyboard/SonicKeyboard.kt b/app/src/main/java/org/cloud/sonic/android/keyboard/SonicKeyboard.kt
@@ -23,6 +23,7 @@ import android.app.Activity
 import android.content.*
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.inputmethodservice.InputMethodService
+import android.os.Build
 import android.provider.Settings
 import android.view.KeyEvent
 import android.view.View
@@ -61,7 +62,11 @@ class SonicKeyboard : InputMethodService() {
  filter.addAction(IME_RECOVER_CLIPBOARD_GET)
  filter.addAction(IME_RECOVER_CLIPBOARD_SET)
  mReceiver = AdbReceiver()
- registerReceiver(mReceiver, filter)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ registerReceiver(mReceiver, filter, RECEIVER_EXPORTED)
+ } else {
+ registerReceiver(mReceiver, filter)
+ }
  }
  mInputView.setOnClickListener {
  val intent = Intent(Settings.ACTION_INPUT_METHOD_SETTINGS)

diff --git a/...c/main/java/org/cloud/sonic/android/plugin/touchPlugin/touchCompat/InputManagerWrapper.kt b/...c/main/java/org/cloud/sonic/android/plugin/touchPlugin/touchCompat/InputManagerWrapper.kt
@@ -34,9 +34,13 @@ class InputManagerWrapper {
 
  init {
  eventInjector = try {
- InputManagerEventInjector()
+ InputManagerGlobalEventInjector()
  } catch (e: UnsupportedOperationException) {
- WindowManagerEventInjector()
+ try {
+ InputManagerEventInjector()
+ } catch (e: UnsupportedOperationException) {
+ WindowManagerEventInjector()
+ }
  }
  }
 
@@ -48,6 +52,53 @@ class InputManagerWrapper {
  fun injectInputEvent(event: InputEvent?): Boolean
  }
 
+ class InputManagerGlobalEventInjector : EventInjector {
+ private val injectMode = 0
+ private var inputManager: Any? = null
+ private var injector: Method? = null
+
+ init {
+ try {
+ var inputManagerGlobal = getInstance("android.hardware.input.InputManagerGlobal");
+ var m = inputManagerGlobal?.javaClass?.getMethod("getInputManagerService");
+ inputManager = m?.invoke(inputManagerGlobal);
+ injector = inputManager?.javaClass
+ ?.getMethod(
+ "injectInputEvent",
+ InputEvent::class.java,
+ Int::class.javaPrimitiveType
+ );
+ }
+ catch (e: Exception) {
+ throw java.lang.UnsupportedOperationException(
+ "InputManagerEventInjector is not supported in this device! " +
+ "Please submit your deviceInfo to https://github.com/SonicCloudOrg/sonic-android-apk"
+ )
+ }
+ }
+ private fun getInstance(className: String): Any {
+ val aClass = Class.forName(className)
+ val getInstance = aClass.getMethod("getInstance")
+ return getInstance.invoke(null)
+ }
+ override fun injectInputEvent(event: InputEvent?): Boolean {
+ return try {
+ injector!!.invoke(
+ inputManager,
+ event,
+ injectMode
+ )
+ true
+ } catch (e: IllegalAccessException) {
+ e.printStackTrace()
+ false
+ } catch (e: InvocationTargetException) {
+ e.printStackTrace()
+ false
+ }
+ }
+ }
+
  class InputManagerEventInjector : EventInjector {
  private val injectMode = 0
  private var inputManager: Any? = null

diff --git a/app/src/main/java/org/cloud/sonic/android/service/SonicManagerServiceV2.kt b/app/src/main/java/org/cloud/sonic/android/service/SonicManagerServiceV2.kt
@@ -20,6 +20,7 @@ package org.cloud.sonic.android.service
 import android.app.*
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
 import android.graphics.drawable.Icon
 import android.os.*
 import androidx.annotation.RequiresApi
@@ -78,6 +79,14 @@ class SonicManagerServiceV2 : Service(), TcpServerListener {
  }
  }
 
+ fun StartForeground(id: Int, notification: Notification) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
+ } else {
+ startForeground(NOTIFICATION_ID, notification)
+ }
+ }
+
  override fun onCreate() {
  super.onCreate()
  LogUtils.i("onCreate")
@@ -91,15 +100,12 @@ class SonicManagerServiceV2 : Service(), TcpServerListener {
  NotificationManager.IMPORTANCE_NONE
  )
  getNotificationManager().createNotificationChannel(channel)
- startForeground(
- NOTIFICATION_ID,
- notification
- )
+ StartForeground(NOTIFICATION_ID, notification)
  } else {
  // 获取服务通知
  val notification: Notification = createNotification(false)
  //将服务置于启动状态 ,NOTIFICATION_ID指的是创建的通知的ID
- startForeground(NOTIFICATION_ID, notification)
+ StartForeground(NOTIFICATION_ID, notification)
  }
  }
 

diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
 
 
 plugins {
- id 'com.android.application' version '7.1.2' apply false
- id 'com.android.library' version '7.1.2' apply false
+ id 'com.android.application' version '8.2.2' apply false
+ id 'com.android.library' version '8.2.2' apply false
  id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib_socketmanager/build.gradle b/lib_socketmanager/build.gradle
@@ -4,11 +4,12 @@ plugins {
 }
 
 android {
- compileSdk 32
+ compileSdk 34
+ namespace "org.cloud.sonic.android.lib.socketmanager"
 
  defaultConfig {
  minSdk 21
- targetSdk 32
+ targetSdk 34
 
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  consumerProguardFiles "consumer-rules.pro"

diff --git a/lib_socketmanager/src/main/AndroidManifest.xml b/lib_socketmanager/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
- package="org.cloud.sonic.android.lib.socketmanager">
+<manifest xmlns:android="http:https://schemas.android.com/apk/res/android">
 
 </manifest>