Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(android): implement getDeliveredNotifications and removeDeliveredNotifications #2266

Merged
merged 3 commits into from
Jan 30, 2020
Merged

fix(android): implement getDeliveredNotifications and removeDeliveredNotifications #2266

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95b9ff5
initial impl of android {get,remove}DeliveredNotifications
p7g Dec 10, 2019
cc93e96
add every key of extras to jsnotif instead of JSONObject.wrap
p7g Dec 10, 2019
6bc01a0
renamed "extra" to "data" to match iOS
p7g Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 59 additions & 2 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/PushNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.getcapacitor.plugin;

import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.service.notification.StatusBarNotification;
import android.support.v4.app.NotificationCompat;
import android.net.Uri;

Expand All @@ -25,6 +28,10 @@
import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.RemoteMessage;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -99,12 +106,62 @@ public void onFailure(Exception e) {

@PluginMethod()
public void getDeliveredNotifications(PluginCall call) {
call.unimplemented();
JSArray notifications = new JSArray();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
StatusBarNotification[] activeNotifications = notificationManager.getActiveNotifications();

for (StatusBarNotification notif : activeNotifications) {
JSObject jsNotif = new JSObject();

jsNotif.put("id", notif.getId());

Notification notification = notif.getNotification();
if (notification != null) {
jsNotif.put("title", notification.extras.getCharSequence(Notification.EXTRA_TITLE));
jsNotif.put("body", notification.extras.getCharSequence(Notification.EXTRA_TEXT));

JSObject extras = new JSObject();

for (String key : notification.extras.keySet()) {
extras.put(key, notification.extras.get(key));
}

jsNotif.put("data", extras);
}

notifications.put(jsNotif);
}
}

JSObject result = new JSObject();
result.put("notifications", notifications);
call.resolve(result);
}

@PluginMethod()
public void removeDeliveredNotifications(PluginCall call) {
call.unimplemented();
JSArray notifications = call.getArray("notifications");

List<Integer> ids = new ArrayList<>();
try {
for (Object o : notifications.toList()) {
if (o instanceof JSONObject) {
JSObject notif = JSObject.fromJSONObject((JSONObject) o);
Integer id = notif.getInteger("id");
ids.add(id);
} else {
call.reject("Expected notifications to be a list of notification objects");
}
}
} catch (JSONException e) {
call.reject(e.getMessage());
}

for (int id : ids) {
notificationManager.cancel(id);
}

call.resolve();
}

@PluginMethod()
Expand Down