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
Change power alert content, include battery %
Luke Sfcf108e952ec
diff --git a/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.javaindex a7469e0..6d474fa 100644--- a/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java+++ b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java@@ -5,8 +5,10 @@ import android.content.Context;import android.content.Intent;import android.content.IntentFilter;import android.os.BatteryManager;+import android.os.Build;import org.havenapp.main.R;+import org.havenapp.main.Utils;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.service.MonitorService;@@ -28,21 +30,11 @@ public class PowerConnectionReceiver extends BroadcastReceiver {// explicitly check the intent action// avoids lint issue UnsafeProtectedBroadcastReceiver- 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:- isCharging = true;break;case Intent.ACTION_POWER_DISCONNECTED:- isCharging = false;break;default:return;@@ -50,19 +42,35 @@ public class PowerConnectionReceiver extends BroadcastReceiver {if (MonitorService.getInstance() != null&& MonitorService.getInstance().isRunning()) {- MonitorService.getInstance().alert(EventTrigger.POWER, context.getString(R.string.status_charging) + isCharging );+ MonitorService.getInstance().alert(EventTrigger.POWER,+ Utils.getBatteryPercentage(context) + "%" + " \n" ++ context.getString(R.string.power_source_status) + " " ++ getBatteryStatus(context));}}//Ref: https://developer.android.com/training/monitoring-device-state/battery-monitoring.html- private void getBatteryStatus(Context context) {+ private String getBatteryStatus(Context context) {IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);Intent batteryStatus = context.registerReceiver(null, ifilter);-- // How are we charging?+ String battStatus;int chargePlug = batteryStatus.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);boolean usbCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_USB;boolean acCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_AC;+ boolean wirelessCharge = false;++ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)+ wirelessCharge = chargePlug == BatteryManager.BATTERY_PLUGGED_WIRELESS;++ if (usbCharge)+ battStatus = context.getString(R.string.power_source_status_usb);+ else if (acCharge)+ battStatus = context.getString(R.string.power_source_status_ac);+ else if (wirelessCharge)+ battStatus = context.getString(R.string.power_source_status_wireless);+ else battStatus = context.getString(R.string.power_disconnected);++ return battStatus;}}