Updates for Android SDK 23.

[~andy/spades] / src / Task.java

diff --git a/src/Task.java b/src/Task.java
index 26e0bd872343b7ce1a09c78755970ff5920d9ca6..f912a574fa4b809a6029b4417dd1073f4fa0faad 100644 (file)
--- a/src/Task.java
+++ b/src/Task.java
@@ -58,11 +58,17 @@ public class Task extends Service implements Runnable
                this.command(NOTIFY, text);
 
                // Notification bar
-               Notification  note   = new Notification(icon, null, 0);
                Intent        intent = new Intent(this, Main.class);
                PendingIntent pend   = PendingIntent.getActivity(this, 0, intent, 0);
 
-               note.setLatestEventInfo(this, "Spades!", text, pend);
+               Notification.Builder nb = new Notification.Builder(this)
+                               .setContentIntent(pend)
+                               .setSmallIcon(icon)
+                               .setContentTitle("Spades!")
+                               .setOngoing(true)
+                               .setContentText(text);
+
+               Notification note = nb.build();
                this.startForeground(1, note);
        }
 
@@ -134,7 +140,6 @@ public class Task extends Service implements Runnable
        }
 
        /* Runnable methods */
-       @Override
        public void run()
        {
                Os.debug("Task: thread run");
@@ -221,14 +226,14 @@ public class Task extends Service implements Runnable
        }
 
        @Override
-       @SuppressWarnings("deprecation")
-       public void onStart(Intent intent, int startId)
+       public int onStartCommand(Intent intent, int flags, int startId)
        {
                Os.debug("Task: onStart");
-               super.onStart(intent, startId);
+               super.onStartCommand(intent, flags, startId);
                int       cmd = intent.getExtras().getInt("Command");
                Messenger mgr = (Messenger)intent.getExtras().get("Messenger");
                this.handle(cmd, mgr);
+               return START_STICKY;
        }
 
        @Override