From e80815cf7eda9755cd319d23ce535c0f7177021b Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Sun, 17 May 2020 14:11:30 +0100
Subject: [PATCH] add json null for making sdk requests. cleanup notifications
 on service shutdown.

---
 .../main/java/org/kivy/android/PythonService.java  |  8 ++++++++
 src/main/java/io/lbry/lbrysdk/LbrynetService.java  | 14 +++++++++-----
 src/main/java/io/lbry/lbrysdk/Utils.java           |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/src/main/java/org/kivy/android/PythonService.java b/p4a/pythonforandroid/bootstraps/lbry/build/src/main/java/org/kivy/android/PythonService.java
index 9f9a8fe..d048dc0 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/src/main/java/org/kivy/android/PythonService.java
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/src/main/java/org/kivy/android/PythonService.java
@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.content.Context;
 import android.util.Log;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.os.Process;
 import java.io.File;
@@ -126,9 +127,16 @@ public class PythonService extends Service implements Runnable {
             serviceEntrypoint, pythonName,
             pythonHome, pythonPath,
             pythonServiceArgument);
+        cleanupNotifications();
         stopSelf();
     }
 
+    public void cleanupNotifications() {
+        Context context = getApplicationContext();
+        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+    }
+
     // Native part
     public static native void nativeStart(
             String androidPrivate, String androidArgument,
diff --git a/src/main/java/io/lbry/lbrysdk/LbrynetService.java b/src/main/java/io/lbry/lbrysdk/LbrynetService.java
index db674e0..d7a0ef5 100644
--- a/src/main/java/io/lbry/lbrysdk/LbrynetService.java
+++ b/src/main/java/io/lbry/lbrysdk/LbrynetService.java
@@ -481,6 +481,14 @@ public final class LbrynetService extends PythonService {
         return super.onStartCommand(intent, flags, startId);
     }
 
+    @Override
+    public void cleanupNotifications() {
+        Context context = getApplicationContext();
+        NotificationManager notificationManager =
+            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+    }
+
     @Override
     public void onDestroy() {
         if (downloadReceiver != null) {
@@ -493,11 +501,7 @@ public final class LbrynetService extends PythonService {
             stopServiceReceiver = null;
         }
 
-        Context context = getApplicationContext();
-        NotificationManager notificationManager =
-            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.cancelAll();
-
+        cleanupNotifications();
         super.onDestroy();
         serviceInstance = null;
     }
diff --git a/src/main/java/io/lbry/lbrysdk/Utils.java b/src/main/java/io/lbry/lbrysdk/Utils.java
index e9de17a..7f96ea3 100644
--- a/src/main/java/io/lbry/lbrysdk/Utils.java
+++ b/src/main/java/io/lbry/lbrysdk/Utils.java
@@ -353,7 +353,7 @@ public final class Utils {
             if (params != null) {
                 JSONObject requestParams = new JSONObject();
                 for (Map.Entry<String, Object> entry : params.entrySet()) {
-                    requestParams.put(entry.getKey(), entry.getValue());
+                    requestParams.put(entry.getKey(), entry.getValue() == null ? JSONObject.NULL : entry.getValue());
                 }
                 request.put("params", requestParams);
             }