From a57a5edec6f80693f59fe783b1c153c4c8590603 Mon Sep 17 00:00:00 2001 From: ppjun <953386166@qq.com> Date: Mon, 25 Dec 2023 11:11:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8DAndroid=2014?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- branchs/live-event-bus-x/app/build.gradle | 4 ++-- branchs/live-event-bus-x/app/src/main/AndroidManifest.xml | 4 +++- branchs/live-event-bus-x/lebx-processor-gson/build.gradle | 4 ++-- branchs/live-event-bus-x/liveeventbus-x/build.gradle | 4 ++-- .../jeremyliao/liveeventbus/core/LiveEventBusCore.java | 8 +++++++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/branchs/live-event-bus-x/app/build.gradle b/branchs/live-event-bus-x/app/build.gradle index 3ad6e03..8b621a6 100644 --- a/branchs/live-event-bus-x/app/build.gradle +++ b/branchs/live-event-bus-x/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 34 defaultConfig { applicationId "com.jeremyliao.livedatabus" minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/branchs/live-event-bus-x/app/src/main/AndroidManifest.xml b/branchs/live-event-bus-x/app/src/main/AndroidManifest.xml index 84fa7ce..38d868c 100644 --- a/branchs/live-event-bus-x/app/src/main/AndroidManifest.xml +++ b/branchs/live-event-bus-x/app/src/main/AndroidManifest.xml @@ -10,7 +10,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/branchs/live-event-bus-x/lebx-processor-gson/build.gradle b/branchs/live-event-bus-x/lebx-processor-gson/build.gradle index 55017db..d858a1d 100644 --- a/branchs/live-event-bus-x/lebx-processor-gson/build.gradle +++ b/branchs/live-event-bus-x/lebx-processor-gson/build.gradle @@ -3,11 +3,11 @@ plugins { } android { - compileSdkVersion 27 + compileSdkVersion 34 defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 34 versionCode 1 versionName "1.0" } diff --git a/branchs/live-event-bus-x/liveeventbus-x/build.gradle b/branchs/live-event-bus-x/liveeventbus-x/build.gradle index a0e8a7e..839cb97 100644 --- a/branchs/live-event-bus-x/liveeventbus-x/build.gradle +++ b/branchs/live-event-bus-x/liveeventbus-x/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 34 defaultConfig { minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 34 versionCode 1 versionName "1.0" } diff --git a/branchs/live-event-bus-x/liveeventbus-x/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java b/branchs/live-event-bus-x/liveeventbus-x/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java index dca1751..ede01b0 100644 --- a/branchs/live-event-bus-x/liveeventbus-x/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java +++ b/branchs/live-event-bus-x/liveeventbus-x/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java @@ -1,6 +1,7 @@ package com.jeremyliao.liveeventbus.core; import android.app.Application; +import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Build; @@ -95,6 +96,7 @@ public synchronized Observable with(String key, Class type) { * first of all, call config to get the Config instance * then, call the method of Config to config LiveEventBus * call this method in Application.onCreate + * * @return Config */ public Config config() { @@ -124,7 +126,11 @@ void registerReceiver() { if (application != null) { IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(IpcConst.ACTION); - application.registerReceiver(receiver, intentFilter); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + application.registerReceiver(receiver, intentFilter, Context.RECEIVER_EXPORTED); + } else { + application.registerReceiver(receiver, intentFilter); + } isRegisterReceiver = true; } } From 006ca3c72979fcc6e7eae1f247d818588afc9ff7 Mon Sep 17 00:00:00 2001 From: ppjun <953386166@qq.com> Date: Mon, 25 Dec 2023 15:09:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8DAndroid=2014=EF=BC=88?= =?UTF-8?q?=E9=9D=9EAndroidX=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live-event-bus/app/build.gradle | 4 ++-- live-event-bus/app/src/main/AndroidManifest.xml | 4 +++- live-event-bus/leb-processor-gson/build.gradle | 4 ++-- live-event-bus/liveeventbus/build.gradle | 4 ++-- .../jeremyliao/liveeventbus/core/LiveEventBusCore.java | 8 +++++++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/live-event-bus/app/build.gradle b/live-event-bus/app/build.gradle index a64aed6..94066f4 100644 --- a/live-event-bus/app/build.gradle +++ b/live-event-bus/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 34 defaultConfig { applicationId "com.jeremyliao.livedatabus" minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/live-event-bus/app/src/main/AndroidManifest.xml b/live-event-bus/app/src/main/AndroidManifest.xml index 5ebd3b6..bbfdf25 100644 --- a/live-event-bus/app/src/main/AndroidManifest.xml +++ b/live-event-bus/app/src/main/AndroidManifest.xml @@ -11,7 +11,9 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/live-event-bus/leb-processor-gson/build.gradle b/live-event-bus/leb-processor-gson/build.gradle index deae534..a1a91c6 100644 --- a/live-event-bus/leb-processor-gson/build.gradle +++ b/live-event-bus/leb-processor-gson/build.gradle @@ -3,11 +3,11 @@ plugins { } android { - compileSdkVersion 27 + compileSdkVersion 34 defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 34 versionCode 1 versionName "1.0" } diff --git a/live-event-bus/liveeventbus/build.gradle b/live-event-bus/liveeventbus/build.gradle index 7a4bc86..7cba57d 100644 --- a/live-event-bus/liveeventbus/build.gradle +++ b/live-event-bus/liveeventbus/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 34 defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 34 versionCode 1 versionName "1.0" } diff --git a/live-event-bus/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java b/live-event-bus/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java index 8b81793..1cff87d 100644 --- a/live-event-bus/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java +++ b/live-event-bus/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/core/LiveEventBusCore.java @@ -6,6 +6,7 @@ import android.arch.lifecycle.LifecycleOwner; import android.arch.lifecycle.LiveData; import android.arch.lifecycle.Observer; +import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Build; @@ -94,6 +95,7 @@ public synchronized Observable with(String key, Class type) { * first of all, call config to get the Config instance * then, call the method of Config to config LiveEventBus * call this method in Application.onCreate + * * @return Config */ public Config config() { @@ -123,7 +125,11 @@ void registerReceiver() { if (application != null) { IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(IpcConst.ACTION); - application.registerReceiver(receiver, intentFilter); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + application.registerReceiver(receiver, intentFilter, Context.RECEIVER_EXPORTED); + } else { + application.registerReceiver(receiver, intentFilter); + } isRegisterReceiver = true; } }