Finish migration to API 34

Author: cgutman

app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "org.cgutman.usbipserverforandroid"
-        minSdk 12
+        minSdk 19
         targetSdk 34
     }
 
@@ -23,3 +23,12 @@ android {
         }
     }
 }
+
+dependencies {
+    implementation 'androidx.core:core:1.12.0'
+    implementation 'androidx.activity:activity:1.8.0'
+}
+
+configurations.implementation {
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}

app/src/main/java/org/cgutman/usbip/config/UsbIpConfig.java

@@ -3,22 +3,35 @@
 import org.cgutman.usbip.service.UsbIpService;
 import org.cgutman.usbipserverforandroid.R;
 
-import android.app.Activity;
+import android.Manifest;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-public class UsbIpConfig extends Activity {
+import androidx.activity.ComponentActivity;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.core.content.ContextCompat;
+
+public class UsbIpConfig extends ComponentActivity {
 	private Button serviceButton;
 	private TextView serviceStatus;
 
 	private boolean running;
+
+	private ActivityResultLauncher<String> requestPermissionLauncher =
+			registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
+				// We don't actually care if the permission is granted or not. We will launch the service anyway.
+				startService(new Intent(UsbIpConfig.this, UsbIpService.class));
+			});
 
 	private void updateStatus() {
 		if (running) {
@@ -61,7 +74,13 @@ public void onClick(View v) {
 					stopService(new Intent(UsbIpConfig.this, UsbIpService.class));
 				}
 				else {
-					startService(new Intent(UsbIpConfig.this, UsbIpService.class));
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+						if (ContextCompat.checkSelfPermission(UsbIpConfig.this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
+							startService(new Intent(UsbIpConfig.this, UsbIpService.class));
+						} else {
+							requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
+						}
+					}
 				}
 
 				running = !running;

app/src/main/java/org/cgutman/usbip/service/UsbIpService.java

@@ -53,6 +53,8 @@
 import android.os.PowerManager.WakeLock;
 import android.util.SparseArray;
 
+import androidx.core.app.NotificationCompat;
+
 public class UsbIpService extends Service implements UsbRequestHandler {
 
 	private UsbManager usbManager;
@@ -97,22 +99,16 @@ private void updateNotification() {
 		}
 
 		PendingIntent pendIntent = PendingIntent.getActivity(this, 0, intent, intentFlags);
-		
-		Notification.Builder builder = new Notification.Builder(this)
+
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
+				.setSmallIcon(R.drawable.notification_icon)
+				.setOngoing(true)
+				.setSilent(true)
 				.setTicker("USB/IP Server Running")
 				.setContentTitle("USB/IP Server Running")
 				.setAutoCancel(false)
-				.setOngoing(true)
-				.setSmallIcon(R.drawable.notification_icon)
-				.setContentIntent(pendIntent);
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			builder.setChannelId(CHANNEL_ID);
-		}
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-			builder.setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE);
-		}
+				.setContentIntent(pendIntent)
+				.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE);
 
 		if (connections.size() == 0) {
 			builder.setContentText("No devices currently shared");
@@ -121,7 +117,7 @@ private void updateNotification() {
 			builder.setContentText(String.format("Sharing %d device(s)", connections.size()));
 		}
 
-		startForeground(NOTIFICATION_ID, builder.getNotification());
+		startForeground(NOTIFICATION_ID, builder.build());
 	}
 
 	@SuppressLint("UseSparseArrays")

gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true