From 6582da310a4a06328cafea1fef228db5676345ce Mon Sep 17 00:00:00 2001
From: Jake Whiteley <the.jake.whiteley@gmail.com>
Date: Sun, 29 May 2016 19:19:20 -0400
Subject: [PATCH] Updates for Android SDK 23.

AndroidManifest:
  Updated to reflect new required SDK: 18.

common.mk:
  Update to use current build tools and for my directory layout.
  Will investigate using variables for build system.

src/Task.java
  Use NotificationBuilder for Task notification
  Run is no longer overridden ?
  Use OnStartCommand instead of onStart.
---
 AndroidManifest.xml |  2 +-
 common.mk           |  8 ++++----
 src/Task.java       | 17 +++++++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e09fcda..3bb3da9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,7 +5,7 @@
 	android:versionName="1.0">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
-	<uses-sdk android:minSdkVersion="18" android:targetSdkVersion="18" />
+	<uses-sdk android:minSdkVersion="18" android:targetSdkVersion="23" />
 	<application android:label="@string/app_name"
 		android:icon="@drawable/icon">
 		<activity android:name="Main"
diff --git a/common.mk b/common.mk
index 89d6c28..2104b98 100644
--- a/common.mk
+++ b/common.mk
@@ -2,9 +2,9 @@
 KEYFILE ?= ~/.android/android.p12
 KEYTYPE ?= pkcs12
 KEYNAME ?= android
-ANDROID ?= /opt/android-sdk-update-manager/platforms/android-18/android.jar
+ANDROID ?= /opt/android-sdk-update-manager/platforms/android-23/android.jar
 SDKLIB  ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar
-TOOLS   ?= /opt/android-sdk-update-manager/build-tools/20.0.0
+TOOLS   ?= /opt/android-sdk-update-manager/build-tools/23.0.2
 
 # Variables
 PATH    := $(PATH):$(TOOLS)
@@ -117,8 +117,8 @@ $(OBJ): $(SRC) $(GEN) makefile | obj
 		-Xlint:deprecation        \
 		-bootclasspath $(ANDROID) \
 		-encoding      UTF-8      \
-		-source        1.5        \
-		-target        1.5        \
+		-source        1.7        \
+		-target        1.7        \
 		-classpath     obj        \
 		-d             obj        \
 		$(filter-out makefile,$+)
diff --git a/src/Task.java b/src/Task.java
index 26e0bd8..f912a57 100644
--- 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
-- 
2.43.2