Target SDK 26

* Broadcast restrictions
* Background restrictions
* Adaptive icon

Author: abaker

.travis.yml

@@ -8,9 +8,9 @@ android:
   components:
     - tools # https://github.com/travis-ci/travis-ci/issues/5049
     - tools # https://github.com/travis-ci/travis-ci/issues/6040
-    - android-25
+    - android-26
     - platform-tools
-    - build-tools-25.0.3
+    - build-tools-26.0.1
     - extra-android-m2repository
     - extra-google-m2repository
   licenses:
@@ -23,5 +23,5 @@ before_install:
   - adb shell input keyevent 82 &
 
 script:
-    - ./gradlew :app:lintGoogleplayDebug
-    - ./gradlew :app:connectedGoogleplayDebugAndroidTest
+  - ./gradlew :app:lintGoogleplayDebug
+  - ./gradlew :app:connectedGoogleplayDebugAndroidTest

app/build.gradle

@@ -27,14 +27,14 @@ android {
         textReport true
     }
 
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "org.tasks"
         versionCode 458
         versionName "4.9.15"
-        targetSdkVersion 25
+        targetSdkVersion 26
         minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -94,7 +94,7 @@ configurations {
 final DAGGER_VERSION = '2.9'
 final BUTTERKNIFE_VERSION = '8.8.0'
 final GPS_VERSION = '11.0.4'
-final SUPPORT_VERSION = '25.4.0'
+final SUPPORT_VERSION = '26.0.1'
 final SUPPORT_ANNOTATIONS_VERSION = '26.0.0-alpha1'
 final STETHO_VERSION = '1.4.2'
 final TESTING_SUPPORT_VERSION = '0.5'

app/src/amazon/java/org/tasks/injection/BroadcastComponent.java

@@ -12,6 +12,7 @@
 import org.tasks.receivers.CompleteTaskReceiver;
 import org.tasks.receivers.ListNotificationReceiver;
 import org.tasks.receivers.MyPackageReplacedReceiver;
+import org.tasks.receivers.PushReceiver;
 import org.tasks.receivers.TeslaUnreadReceiver;
 import org.tasks.widget.TasksWidget;
 
@@ -44,4 +45,6 @@ public interface BroadcastComponent {
     void inject(TasksWidget tasksWidget);
 
     void inject(TeslaUnreadReceiver teslaUnreadReceiver);
+
+    void inject(PushReceiver pushReceiver);
 }

app/src/amazon/java/org/tasks/receivers/PushReceiver.java

@@ -0,0 +1,27 @@
+package org.tasks.receivers;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+
+import com.todoroo.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.data.Task;
+
+import org.tasks.injection.BroadcastComponent;
+import org.tasks.injection.InjectingBroadcastReceiver;
+
+public class PushReceiver extends InjectingBroadcastReceiver {
+
+    public static void broadcast(Context context, Task task, ContentValues values) {
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+    }
+
+    @Override
+    protected void inject(BroadcastComponent component) {
+        component.inject(this);
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java

@@ -16,7 +16,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.tasks.Broadcaster;
+import org.tasks.LocalBroadcastManager;
 import org.tasks.Notifier;
 import org.tasks.injection.TestComponent;
 import org.tasks.notifications.NotificationManager;
@@ -41,7 +41,7 @@ public class NotificationTests extends DatabaseTestCase {
     @Module
     public static class NotificationTestsModule {
         private final NotificationManager notificationManager = mock(NotificationManager.class);
-        private final Broadcaster broadcaster = mock(Broadcaster.class);
+        private final LocalBroadcastManager localBroadcastManager = mock(LocalBroadcastManager.class);
         private final Context context;
 
         public NotificationTestsModule(Context context) {
@@ -54,8 +54,8 @@ public NotificationManager getNotificationManager() {
         }
 
         @Provides
-        public Broadcaster getBroadcaster() {
-            return broadcaster;
+        public LocalBroadcastManager getBroadcaster() {
+            return localBroadcastManager;
         }
 
         @Provides
@@ -71,15 +71,15 @@ public interface NotificationTestsComponent {
 
     @Inject TaskDao taskDao;
     @Inject NotificationManager notificationManager;
-    @Inject Broadcaster broadcaster;
+    @Inject LocalBroadcastManager localBroadcastManager;
     @Inject Notifier notifier;
 
     @Override
     public void tearDown() {
         super.tearDown();
 
         verifyNoMoreInteractions(notificationManager);
-        verifyNoMoreInteractions(broadcaster);
+        verifyNoMoreInteractions(localBroadcastManager);
     }
 
     @Test

app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java

@@ -12,7 +12,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.tasks.Broadcaster;
+import org.tasks.LocalBroadcastManager;
 import org.tasks.data.TaskListDataProvider;
 import org.tasks.injection.TestComponent;
 import org.tasks.makers.RemoteGtaskListMaker;
@@ -41,7 +41,7 @@ public class GtasksListServiceTest extends DatabaseTestCase {
     @Inject TaskListDataProvider taskListDataProvider;
     @Inject TaskDeleter taskDeleter;
     @Inject MetadataDao metadataDao;
-    @Inject Broadcaster broadcaster;
+    @Inject LocalBroadcastManager localBroadcastManager;
 
     private StoreObjectDao storeObjectDao;
     private GtasksListService gtasksListService;
@@ -50,7 +50,8 @@ public class GtasksListServiceTest extends DatabaseTestCase {
     public void setUp() {
         super.setUp();
         storeObjectDao = spy(new StoreObjectDao(database));
-        gtasksListService = new GtasksListService(storeObjectDao, taskListDataProvider, taskDeleter, metadataDao, broadcaster);
+        gtasksListService = new GtasksListService(storeObjectDao, taskListDataProvider, taskDeleter,
+                metadataDao, localBroadcastManager);
     }
 
     @Override

app/src/generic/java/org/tasks/injection/BroadcastComponent.java

@@ -12,6 +12,7 @@
 import org.tasks.receivers.CompleteTaskReceiver;
 import org.tasks.receivers.ListNotificationReceiver;
 import org.tasks.receivers.MyPackageReplacedReceiver;
+import org.tasks.receivers.PushReceiver;
 import org.tasks.receivers.TeslaUnreadReceiver;
 import org.tasks.widget.TasksWidget;
 
@@ -44,4 +45,6 @@ public interface BroadcastComponent {
     void inject(TasksWidget tasksWidget);
 
     void inject(TeslaUnreadReceiver teslaUnreadReceiver);
+
+    void inject(PushReceiver pushReceiver);
 }

app/src/generic/java/org/tasks/receivers/PushReceiver.java

@@ -0,0 +1,27 @@
+package org.tasks.receivers;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+
+import com.todoroo.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.data.Task;
+
+import org.tasks.injection.BroadcastComponent;
+import org.tasks.injection.InjectingBroadcastReceiver;
+
+public class PushReceiver extends InjectingBroadcastReceiver {
+
+    public static void broadcast(Context context, Task task, ContentValues values) {
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+    }
+
+    @Override
+    protected void inject(BroadcastComponent component) {
+        component.inject(this);
+    }
+}

app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListService.java

@@ -12,7 +12,7 @@
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.TaskDeleter;
 
-import org.tasks.Broadcaster;
+import org.tasks.LocalBroadcastManager;
 import org.tasks.data.TaskListDataProvider;
 
 import java.util.HashSet;
@@ -33,16 +33,17 @@ public class GtasksListService {
     private final TaskListDataProvider taskListDataProvider;
     private final TaskDeleter taskDeleter;
     private final MetadataDao metadataDao;
-    private final Broadcaster broadcaster;
+    private LocalBroadcastManager localBroadcastManager;
 
     @Inject
     public GtasksListService(StoreObjectDao storeObjectDao, TaskListDataProvider taskListDataProvider,
-                             TaskDeleter taskDeleter, MetadataDao metadataDao, Broadcaster broadcaster) {
+                             TaskDeleter taskDeleter, MetadataDao metadataDao,
+                             LocalBroadcastManager localBroadcastManager) {
         this.storeObjectDao = storeObjectDao;
         this.taskListDataProvider = taskListDataProvider;
         this.taskDeleter = taskDeleter;
         this.metadataDao = metadataDao;
-        this.broadcaster = broadcaster;
+        this.localBroadcastManager = localBroadcastManager;
     }
 
     public List<GtasksList> getLists() {
@@ -95,7 +96,7 @@ public synchronized void updateLists(List<TaskList> remoteLists) {
             deleteList(storeObjectDao.getGtasksList(listId));
         }
 
-        broadcaster.refreshLists();
+        localBroadcastManager.broadcastRefreshList();
     }
 
     public void deleteList(GtasksList gtasksList) {

app/src/googleplay/java/org/tasks/billing/InventoryHelper.java

@@ -8,7 +8,7 @@
 import com.android.vending.billing.Inventory;
 import com.android.vending.billing.Purchase;
 
-import org.tasks.Broadcaster;
+import org.tasks.LocalBroadcastManager;
 import org.tasks.R;
 import org.tasks.injection.ApplicationScope;
 import org.tasks.injection.ForApplication;
@@ -26,17 +26,17 @@ public class InventoryHelper implements IabBroadcastReceiver.IabBroadcastListene
 
     private final Context context;
     private final Preferences preferences;
-    private final Broadcaster broadcaster;
+    private final LocalBroadcastManager localBroadcastManager;
     private final Executor executor;
 
     private Inventory inventory;
 
     @Inject
     public InventoryHelper(@ForApplication Context context, Preferences preferences,
-                           Broadcaster broadcaster, @Named("iab-executor") Executor executor) {
+                           LocalBroadcastManager localBroadcastManager, @Named("iab-executor") Executor executor) {
         this.context = context;
         this.preferences = preferences;
-        this.broadcaster = broadcaster;
+        this.localBroadcastManager = localBroadcastManager;
         this.executor = executor;
     }
 
@@ -69,7 +69,7 @@ private IabHelper.QueryInventoryFinishedListener getQueryListener(final IabHelpe
                 checkPurchase(R.string.sku_tesla_unread, R.string.p_purchased_tesla_unread);
                 checkPurchase(R.string.sku_dashclock, R.string.p_purchased_dashclock);
                 checkPurchase(R.string.sku_themes, R.string.p_purchased_themes);
-                broadcaster.refresh();
+                localBroadcastManager.broadcastRefresh();
             } else {
                 Timber.e("query inventory failed: %s", result.getMessage());
             }