Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

Begin add power events

Luke Sd8aa371409d8
diff --git a/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java
index fb584bc..a7469e0 100644
--- a/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java
+++ b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java
@@ -3,6 +3,8 @@ package org.havenapp.main.sensors;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
import org.havenapp.main.R;
import org.havenapp.main.model.EventTrigger;
@@ -26,7 +28,14 @@ public class PowerConnectionReceiver extends BroadcastReceiver {
// explicitly check the intent action
// avoids lint issue UnsafeProtectedBroadcastReceiver
- boolean isCharging;
+ int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+ boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
+ status == BatteryManager.BATTERY_STATUS_FULL;
+
+ int chargePlug = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+ boolean usbCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_USB;
+ boolean acCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_AC;
+
if(intent.getAction() == null) return;
switch(intent.getAction()){
case Intent.ACTION_POWER_CONNECTED:
@@ -44,4 +53,16 @@ public class PowerConnectionReceiver extends BroadcastReceiver {
MonitorService.getInstance().alert(EventTrigger.POWER, context.getString(R.string.status_charging) + isCharging );
}
}
+
+ //Ref: https://developer.android.com/training/monitoring-device-state/battery-monitoring.html
+
+ private void getBatteryStatus(Context context) {
+ IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+ Intent batteryStatus = context.registerReceiver(null, ifilter);
+
+ // How are we charging?
+ int chargePlug = batteryStatus.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+ boolean usbCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_USB;
+ boolean acCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_AC;
+ }
}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 30b57aa..46eaa53 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -80,6 +80,7 @@
<string name="action_cancel">Deactivate</string>
<string name="status_on">ACTIVE</string>
<string name="status_charging">Charging:</string>
+ <string name="power_source">Power Source: </string>
<string name="you_will_receive_a_text_when_the_app_hears_or_sees_something">You will receive a text when the app hears or sees something</string>
<string name="know_immediately_when_haven_detects_something">Know immediately when Haven detects something</string>
<string name="phone_saved">Phone number saved!</string>