Update app to target API 28

.travis.yml

@@ -4,8 +4,8 @@ sudo: false
 
 env:
   global:
-    - ANDROID_API_LEVEL=26
-    - ANDROID_BUILD_TOOLS_VERSION=26.0.2
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
     - ANDROID_ABI=armeabi-v7a
     - ANDROID_TAG=google_apis
     - ADB_INSTALL_TIMEOUT=20

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -94,10 +95,6 @@
                 <action android:name="${applicationId}.action.NOTIFICATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
-            </intent-filter>
         </activity>
 
         <activity
@@ -147,12 +144,6 @@
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_TIME_UPDATED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_TIME_ERROR" />
-            </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
@@ -166,12 +157,6 @@
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_TIME_UPDATED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_TIME_ERROR" />
-            </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
@@ -185,23 +170,13 @@
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_TIME_UPDATED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_TIME_ERROR" />
-            </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_text" />
         </receiver>
 
-        <receiver android:name=".alarm.AlarmReceiver">
-            <intent-filter>
-                <action android:name="${applicationId}.action.PRAYER_CONTEXT_UPDATED" />
-            </intent-filter>
-        </receiver>
+        <receiver android:name=".alarm.AlarmReceiver" />
 
         <service
             android:name=".widget.DashClockService"

app/src/main/java/com/i906/mpt/BaseMptApplication.java

@@ -3,7 +3,6 @@
 import android.app.Application;
 
 import com.crashlytics.android.Crashlytics;
-import com.i906.mpt.alarm.StartupReceiver;
 import com.i906.mpt.internal.Dagger;
 import com.i906.mpt.internal.FabricTree;
 import com.i906.mpt.internal.Graph;
@@ -17,7 +16,6 @@ public abstract class BaseMptApplication extends Application {
     public void onCreate() {
         super.onCreate();
         onPreCreate();
-        StartupReceiver.startup(this);
     }
 
     public void onPreCreate() {

app/src/main/java/com/i906/mpt/alarm/AlarmReceiver.java

@@ -3,12 +3,10 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 
 import com.i906.mpt.extension.Extension;
 import com.i906.mpt.internal.Dagger;
 import com.i906.mpt.prayer.PrayerBroadcaster;
-import com.i906.mpt.widget.WidgetService;
 
 import javax.inject.Inject;
 
@@ -39,18 +37,13 @@ public void onReceive(Context context, Intent intent) {
         if (prayer == -1 || time == -1) return;
 
         if (AlarmService.ACTION_NOTIFICATION_REMINDER.equals(action)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                mNotificationHelper.showNougatPrayerReminder(prayer, time, location);
-            } else {
-                mNotificationHelper.showPrayerReminder(prayer, time, location, true);
-            }
+            mNotificationHelper.showPrayerReminder(prayer, time, location, true);
         }
 
         if (AlarmService.ACTION_NOTIFICATION_PRAYER.equals(action)) {
             mNotificationHelper.showPrayerNotification(prayer, time, location);
             mPrayerBroadcaster.sendPrayerUpdatedBroadcast();
             mNotificationHelper.cancel(getPreviousPrayerIndex(prayer));
-            WidgetService.start(context);
         }
 
         if (AlarmService.ACTION_NOTIFICATION_CANCEL.equals(action)) {

app/src/main/java/com/i906/mpt/alarm/AlarmService.java

@@ -77,14 +77,26 @@ public class AlarmService extends Service {
     public void onCreate() {
         super.onCreate();
 
+        Timber.i("Created service");
+
         Dagger.getGraph(this)
                 .serviceGraph(new ServiceModule(this))
                 .inject(this);
 
         mAlarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+
+        executeForeground();
         startObservable();
     }
 
+    private void executeForeground() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        startForeground(1, mNotificationHelper.createForegroundNotification("Updating prayer times..."));
+    }
+
     private void startObservable() {
         Subscription s = mPrayerManager.getPrayerContext(false)
                 .subscribeOn(Schedulers.io())
@@ -107,6 +119,8 @@ public void call(Throwable throwable) {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        Timber.i("Received start command");
+
         if (intent != null) {
             final String action = intent.getAction();
 
@@ -214,9 +228,17 @@ private void setAlarm(String action, int index, long time, long triggerOffset, S
         long trigger = time + triggerOffset;
         Date alarm = new Date(trigger);
 
-        if (mDateHelper.isInPast(alarm)) {
-            // Skip setting alarm if date is already past
-            return;
+        if (action.equals(ACTION_NOTIFICATION_REMINDER)) {
+            if (mDateHelper.isInPast(new Date(time))) {
+                Timber.i("Skipping alarm %s: %s %s", index, action, alarm);
+                return;
+            }
+        } else {
+            if (mDateHelper.isInPast(alarm)) {
+                Timber.i("Skipping alarm %s: %s %s", index, action, alarm);
+                // Skip setting alarm if date is already past
+                return;
+            }
         }
 
         if (SDK_INT < Build.VERSION_CODES.M) {
@@ -241,6 +263,7 @@ private Intent createIntent(String action, int index, long time, String location
     @Override
     public void onDestroy() {
         super.onDestroy();
+        Timber.i("Destroyed service");
         mSubscription.clear();
     }
 
@@ -249,4 +272,16 @@ public void onDestroy() {
     public IBinder onBind(Intent intent) {
         return null;
     }
+
+    public static void start(Context context, String action) {
+        Timber.i("Starting service");
+        Intent alarm = new Intent(context, AlarmService.class);
+        alarm.setAction(action);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            context.startForegroundService(alarm);
+        } else {
+            context.startService(alarm);
+        }
+    }
 }