From eee3bc483806492ab91644228fb9024c1686a4ee Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 8 Apr 2019 16:48:19 +0200 Subject: [PATCH] LINT: WakeLocks --- .../nightscout/androidaps/MainActivity.java | 2 +- .../nsclient/services/NSClientService.java | 4 +-- .../androidaps/queue/QueueThread.java | 2 +- .../receivers/KeepAliveReceiver.java | 2 +- .../androidaps/watchfaces/BIGChart.java | 2 +- .../androidaps/watchfaces/BaseWatchFace.java | 2 +- .../watchfaces/CircleWatchface.java | 32 +++++++++---------- .../androidaps/watchfaces/NOChart.java | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java index 02076ecb14..f441a8b243 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java +++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java @@ -172,7 +172,7 @@ public class MainActivity extends AppCompatActivity { boolean keepScreenOn = SP.getBoolean(R.string.key_keep_screen_on, false); final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); if (keepScreenOn) { - mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "AAPS"); + mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "AndroidAPS:MainActivity_onEventPreferenceChange"); if (!mWakeLock.isHeld()) mWakeLock.acquire(); } else { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java index 359c224158..c14a3382b3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java @@ -120,7 +120,7 @@ public class NSClientService extends Service { } PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE); - mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "NSClientService"); + mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService"); initialize(); } @@ -499,7 +499,7 @@ public class NSClientService extends Service { public void run() { PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE); PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, - "onDataUpdate"); + "AndroidAPS:NSClientService_onDataUpdate"); wakeLock.acquire(); try { diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java index c6aaab43b7..3dd5c3e6d0 100644 --- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java +++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java @@ -41,7 +41,7 @@ public class QueueThread extends Thread { Context context = MainApp.instance().getApplicationContext(); if (context != null) { PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); - mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "QueueThread"); + mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:QueueThread"); } } diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java index 2679f68985..9acc217904 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java +++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java @@ -44,7 +44,7 @@ public class KeepAliveReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent rIntent) { PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); - PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, ""); + PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:KeepAliveReciever"); wl.acquire(); LocalAlertUtils.shortenSnoozeInterval(); diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java index b61bdc866b..ec2e8c6e5e 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java @@ -107,7 +107,7 @@ public class BIGChart extends WatchFace implements SharedPreferences.OnSharedPre Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)) .getDefaultDisplay(); display.getSize(displaySize); - wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Clock"); + wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:BIGChart"); specW = View.MeasureSpec.makeMeasureSpec(displaySize.x, View.MeasureSpec.EXACTLY); diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java index 47ea3dbf08..3c10981923 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java @@ -116,7 +116,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferen super.onCreate(); Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); display.getSize(displaySize); - wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Clock"); + wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:BaseWatchFace"); specW = View.MeasureSpec.makeMeasureSpec(displaySize.x, View.MeasureSpec.EXACTLY); if (forceSquareCanvas) { diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java index 08aa2b4ff8..c795a03ae4 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CircleWatchface.java @@ -92,7 +92,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh super.onCreate(); PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); - PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "CreateWakelock"); + PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:CircleWatchface"); wakeLock.acquire(30000); Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)) @@ -199,7 +199,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh } else { textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18); } - if(sharedPrefs.getBoolean("showAvgDelta", true)){ + if (sharedPrefs.getBoolean("showAvgDelta", true)) { textView.append(" " + getAvgDelta()); } @@ -322,11 +322,11 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh protected void onTimeChanged(WatchFaceTime oldTime, WatchFaceTime newTime) { if (oldTime.hasMinuteChanged(newTime)) { PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); - PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "TimeChangedWakelock"); + PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:CircleWatchface_onTimeChanged"); wakeLock.acquire(30000); /*Preparing the layout just on every minute tick: - * - hopefully better battery life - * - drawback: might update the minutes since last reading up endTime one minute late*/ + * - hopefully better battery life + * - drawback: might update the minutes since last reading up endTime one minute late*/ prepareLayout(); prepareDrawTime(); invalidate(); //redraw the time @@ -472,6 +472,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh private String getAvgDelta() { return avgDelta; } + private void setAvgDelta(String avgDelta) { this.avgDelta = avgDelta; } @@ -518,11 +519,10 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh @Override public void onReceive(Context context, Intent intent) { PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); - PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, - "MyWakelockTag"); + PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:MessageReceiver"); wakeLock.acquire(30000); Bundle bundle = intent.getBundleExtra("data"); - if (bundle!= null) { + if (bundle != null) { DataMap dataMap = DataMap.fromBundle(bundle); setSgvLevel((int) dataMap.getLong("sgvLevel")); Log.d("CircleWatchface", "sgv level : " + getSgvLevel()); @@ -561,7 +561,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh public synchronized void addToWatchSet(DataMap dataMap) { - if(!sharedPrefs.getBoolean("showRingHistory", false)){ + if (!sharedPrefs.getBoolean("showRingHistory", false)) { bgDataList.clear(); return; } @@ -706,14 +706,14 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh @Override protected void onTapCommand(int tapType, int x, int y, long eventTime) { - int extra = mSgv!=null?(mSgv.getRight() - mSgv.getLeft())/2:0; + int extra = mSgv != null ? (mSgv.getRight() - mSgv.getLeft()) / 2 : 0; - if (tapType == TAP_TYPE_TAP&& - x + extra >=mSgv.getLeft() && - x - extra <= mSgv.getRight()&& + if (tapType == TAP_TYPE_TAP && + x + extra >= mSgv.getLeft() && + x - extra <= mSgv.getRight() && y >= mSgv.getTop() && - y <= mSgv.getBottom()){ - if (eventTime - sgvTapTime < 800){ + y <= mSgv.getBottom()) { + if (eventTime - sgvTapTime < 800) { Intent intent = new Intent(this, MainMenuActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); @@ -723,7 +723,7 @@ public class CircleWatchface extends WatchFace implements SharedPreferences.OnSh } @Override - protected WatchFaceStyle getWatchFaceStyle(){ + protected WatchFaceStyle getWatchFaceStyle() { return new WatchFaceStyle.Builder(this).setAcceptsTapEvents(true).build(); } diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java index 68b5e7f15a..991d0c4e80 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/NOChart.java @@ -90,7 +90,7 @@ public class NOChart extends WatchFace implements SharedPreferences.OnSharedPref Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)) .getDefaultDisplay(); display.getSize(displaySize); - wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Clock"); + wakeLock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NOChart"); specW = View.MeasureSpec.makeMeasureSpec(displaySize.x, View.MeasureSpec.EXACTLY);