LBRYCommunity/lbry-android-sdk
1
0
Fork 0
Code Issues 1 Pull requests 5 Projects Releases 26 Packages Wiki Activity

add json null for making sdk requests. cleanup notifications on service shutdown.

Browse source
This commit is contained in:
Akinwale Ariwodola 2020-05-17 14:11:30 +01:00
parent 6b8b227af7
commit e80815cf7e
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
p4a/pythonforandroid/bootstraps/lbry/build/src/main/java/org/kivy/android/PythonService.java
View file

@ -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,

14
src/main/java/io/lbry/lbrysdk/LbrynetService.java
View file

@ -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;
}

2
src/main/java/io/lbry/lbrysdk/Utils.java
View file

@ -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);
}