wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extract checks for Doze support to separate class

Browse source
This commit is contained in:
cketti 2017-05-23 22:35:30 +02:00
parent 754837d5ef
commit 949902a860
3 changed files with 61 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
k9mail/src/main/java/com/fsck/k9/helper/K9AlarmManager.java
View file

@ -1,56 +1,48 @@
package com.fsck.k9.helper;
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.os.Build;
import android.os.PowerManager;
import android.support.annotation.RequiresApi;
import android.support.annotation.VisibleForTesting;
import com.fsck.k9.power.DozeChecker;
public class K9AlarmManager {
private final AlarmManager alarmManager;
private final PowerManager powerManager;
private final String packageName;
private final DozeChecker dozeChecker;
@VisibleForTesting
K9AlarmManager(Context context) {
alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
packageName = context.getPackageName();
}
public static K9AlarmManager getAlarmManager(Context context) {
return new K9AlarmManager(context);
AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
DozeChecker dozeChecker = new DozeChecker(context);
return new K9AlarmManager(alarmManager, dozeChecker);
}
@VisibleForTesting
K9AlarmManager(AlarmManager alarmManager, DozeChecker dozeChecker) {
this.alarmManager = alarmManager;
this.dozeChecker = dozeChecker;
}
public void set(int type, long triggerAtMillis, PendingIntent operation) {
if (isDozeSupported() && isDozeWhiteListed()) {
if (dozeChecker.isDeviceIdleModeSupported() && dozeChecker.isAppWhitelisted()) {
setAndAllowWhileIdle(type, triggerAtMillis, operation);
} else {
alarmManager.set(type, triggerAtMillis, operation);
}
}
@TargetApi(Build.VERSION_CODES.M)
public void setAndAllowWhileIdle(int type, long triggerAtMillis, PendingIntent operation) {
@RequiresApi(Build.VERSION_CODES.M)
private void setAndAllowWhileIdle(int type, long triggerAtMillis, PendingIntent operation) {
alarmManager.setAndAllowWhileIdle(type, triggerAtMillis, operation);
}
public void cancel(PendingIntent operation) {
alarmManager.cancel(operation);
}
@VisibleForTesting
protected boolean isDozeSupported() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
}
@TargetApi(Build.VERSION_CODES.M)
private boolean isDozeWhiteListed() {
return powerManager.isIgnoringBatteryOptimizations(packageName);
}
}

28
k9mail/src/main/java/com/fsck/k9/power/DozeChecker.java Normal file
View file

@ -0,0 +1,28 @@
package com.fsck.k9.power;
import android.content.Context;
import android.os.Build;
import android.os.PowerManager;
import android.support.annotation.RequiresApi;
public class DozeChecker {
private final PowerManager powerManager;
private final String packageName;
public DozeChecker(Context context) {
powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
packageName = context.getPackageName();
}
public boolean isDeviceIdleModeSupported() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
}
@RequiresApi(api = Build.VERSION_CODES.M)
public boolean isAppWhitelisted() {
return powerManager.isIgnoringBatteryOptimizations(packageName);
}
}

70
k9mail/src/test/java/com/fsck/k9/helper/K9AlarmManagerTest.java
View file

@ -1,13 +1,10 @@
package com.fsck.k9.helper;
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.os.Build.VERSION_CODES;
import android.os.PowerManager;
import com.fsck.k9.power.DozeChecker;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
@ -19,7 +16,6 @@ import static org.mockito.Mockito.when;
public class K9AlarmManagerTest {
private static final String PACKAGE_NAME = "org.example.package";
private static final int TIMER_TYPE = AlarmManager.RTC_WAKEUP;
private static final long TIMEOUT = 15L * 60L * 1000L;
private static final PendingIntent PENDING_INTENT = createDummyPendingIntent();
@ -27,16 +23,21 @@ public class K9AlarmManagerTest {
@Mock
private AlarmManager systemAlarmManager;
@Mock
private DozeChecker dozeChecker;
private K9AlarmManager alarmManager;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
alarmManager = new K9AlarmManager(systemAlarmManager, dozeChecker);
}
@Test
public void set_withoutDozeSupport_shouldCallSetOnAlarmManager() throws Exception {
K9AlarmManager alarmManager = createK9AlarmManagerWithoutDozeSupport();
configureDozeSupport(false);
alarmManager.set(TIMER_TYPE, TIMEOUT, PENDING_INTENT);
@ -45,27 +46,27 @@ public class K9AlarmManagerTest {
@Test
public void set_withDozeSupportAndNotWhiteListed_shouldCallSetOnAlarmManager() throws Exception {
K9AlarmManager alarmManager = createK9AlarmManagerWithDozeSupport(false);
configureDozeSupport(true);
alarmManager.set(TIMER_TYPE, TIMEOUT, PENDING_INTENT);
verify(systemAlarmManager).set(TIMER_TYPE, TIMEOUT, PENDING_INTENT);
}
@TargetApi(VERSION_CODES.M)
@Test
public void set_withDozeSupportAndWhiteListed_shouldCallSetAndAllowWhileIdleOnAlarmManager() throws Exception {
K9AlarmManager alarmManager = createK9AlarmManagerWithDozeSupport(true);
configureDozeSupport(true);
addAppToBatteryOptimizationWhitelist();
alarmManager.set(TIMER_TYPE, TIMEOUT, PENDING_INTENT);
verify(systemAlarmManager).setAndAllowWhileIdle(TIMER_TYPE, TIMEOUT, PENDING_INTENT);
}
@TargetApi(VERSION_CODES.M)
@Test
public void cancel_shouldCallCancelOnAlarmManager() throws Exception {
K9AlarmManager alarmManager = createK9AlarmManagerWithDozeSupport(true);
configureDozeSupport(true);
addAppToBatteryOptimizationWhitelist();
alarmManager.cancel(PENDING_INTENT);
@ -73,54 +74,15 @@ public class K9AlarmManagerTest {
}
private K9AlarmManager createK9AlarmManagerWithDozeSupport(boolean whiteListed) {
PowerManager powerManager = createPowerManager(whiteListed);
Context context = createContext(powerManager);
return new TestK9AlarmManager(context, true);
private void configureDozeSupport(boolean supported) {
when(dozeChecker.isDeviceIdleModeSupported()).thenReturn(supported);
}
private K9AlarmManager createK9AlarmManagerWithoutDozeSupport() {
PowerManager powerManager = mock(PowerManager.class);
Context context = createContext(powerManager);
return new TestK9AlarmManager(context, false);
}
@TargetApi(VERSION_CODES.M)
private PowerManager createPowerManager(boolean whiteListed) {
PowerManager powerManager = mock(PowerManager.class);
when(powerManager.isIgnoringBatteryOptimizations(PACKAGE_NAME)).thenReturn(whiteListed);
return powerManager;
}
private Context createContext(PowerManager powerManager) {
Context context = mock(Context.class);
when(context.getPackageName()).thenReturn(PACKAGE_NAME);
when(context.getSystemService(Context.ALARM_SERVICE)).thenReturn(systemAlarmManager);
when(context.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
return context;
private void addAppToBatteryOptimizationWhitelist() {
when(dozeChecker.isAppWhitelisted()).thenReturn(true);
}
private static PendingIntent createDummyPendingIntent() {
return mock(PendingIntent.class);
}
class TestK9AlarmManager extends K9AlarmManager {
private final boolean dozeSupported;
TestK9AlarmManager(Context context, boolean dozeSupported) {
super(context);
this.dozeSupported = dozeSupported;
}
@Override
protected boolean isDozeSupported() {
return dozeSupported;
}
}
}