Skip to content

fix(battery_plus): Use context compat to set exported state #1811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vbuberen merged 5 commits into from
May 15, 2023
Merged

fix(battery_plus): Use context compat to set exported state #1811

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e18b384
chore(battery_plus): Use context compat to set exported state
reidbaker May 12, 2023
d6af637
remove ; and use non null context
reidbaker May 12, 2023
4a15f6a
Note to not merge with current implementation
reidbaker May 12, 2023
4366f35
Do not export charging state it causes alternating values
reidbaker May 12, 2023
0d68d92
remove pre review comment.
reidbaker May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/battery_plus/battery_plus/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "androidx.core:core-ktx:1.10.1"
}
13 changes: 12 additions & 1 deletion ...ttery_plus/android/src/main/kotlin/dev/fluttercommunity/plus/battery/BatteryPlusPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.fluttercommunity.plus.battery

import android.annotation.SuppressLint
import io.flutter.plugin.common.MethodChannel.MethodCallHandler
import io.flutter.plugin.common.EventChannel
import io.flutter.embedding.engine.plugins.FlutterPlugin
Expand All @@ -20,6 +21,9 @@ import java.util.Locale
import android.os.PowerManager
import android.provider.Settings
import androidx.annotation.RequiresApi
import androidx.core.content.ContextCompat
import androidx.core.content.ContextCompat.RECEIVER_NOT_EXPORTED


/** BatteryPlusPlugin */
class BatteryPlusPlugin : MethodCallHandler, EventChannel.StreamHandler, FlutterPlugin {
Expand Down Expand Up @@ -77,9 +81,16 @@ class BatteryPlusPlugin : MethodCallHandler, EventChannel.StreamHandler, Flutter
}
}

@SuppressLint("WrongConstant") // Error in ContextCompat for RECEIVER_NOT_EXPORTED
Copy link
Contributor Author

@reidbaker reidbaker May 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I filed a bug against androidx for this behavior https://b.corp.google.com/issues/282596027

override fun onListen(arguments: Any?, events: EventSink) {
chargingStateChangeReceiver = createChargingStateChangeReceiver(events)
applicationContext?.registerReceiver(chargingStateChangeReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
// DO NOT MERGE, this alternates states. reidbaker debug before review.
Copy link
Collaborator

@vbuberen vbuberen May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a forgotten comment? Because I see that the PR is marked as ready for review, but this comment is here.

Copy link
Contributor Author

@reidbaker reidbaker May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, sorry I wanted to make sure not to merge/reivew until my local testing worked. Sorry, removed.

applicationContext?.let {
ContextCompat.registerReceiver(
it, chargingStateChangeReceiver,
IntentFilter(Intent.ACTION_BATTERY_CHANGED), RECEIVER_NOT_EXPORTED
)
}
val status = getBatteryStatus()
publishBatteryStatus(events, status)
}
Expand Down
2 changes: 1 addition & 1 deletion packages/battery_plus/battery_plus/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}