fix kivy#2768 smallIconName null can t be compared to String (kivy#2769)

brvier · web-flow · commit f7ba0122b9bb · 2023-03-18T13:47:58.000+01:00
* fix kivy#2768 smallIconName null can t be compared to String * fix: Remove Importance None of notification which is modification from my own fork * fix: Readd Importance_NONE in the notification channel as it s also in upstream p4a
diff --git a/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java b/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java
@@ -113,18 +113,20 @@ protected void doStartForeground(Bundle extras) {
 
 	// Unspecified icon uses default.
 	int smallIconId = context.getApplicationInfo().icon;
-	if (!smallIconName.equals("")){
-	    int resId = getResources().getIdentifier(smallIconName, "mipmap",
-						     getPackageName());
-	    if (resId ==0) {
-		resId = getResources().getIdentifier(smallIconName, "drawable",
-						     getPackageName());
-	    }
-	    if (resId !=0) {
-		smallIconId = resId;
-	    }
-	}
-	    
+    if (smallIconName != null) {
+        if (!smallIconName.equals("")){
+            int resId = getResources().getIdentifier(smallIconName, "mipmap",
+                                 getPackageName());
+            if (resId ==0) {
+            resId = getResources().getIdentifier(smallIconName, "drawable",
+                                 getPackageName());
+            }
+            if (resId !=0) {
+            smallIconId = resId;
+            }
+        }
+    }
+
 	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
 	    // This constructor is deprecated
             notification = new Notification(
@@ -143,9 +145,8 @@ protected void doStartForeground(Bundle extras) {
             // https://stackoverflow.com/questions/47531742/startforeground-fail-after-upgrade-to-android-8-1
             String NOTIFICATION_CHANNEL_ID = "org.kivy.p4a" + getServiceId();
             String channelName = "Background Service" + getServiceId();
-            NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, 
-                NotificationManager.IMPORTANCE_NONE);
-            
+            NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
+
             chan.setLightColor(Color.BLUE);
             chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
