mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 20:57:42 +00:00
Code Issues Releases Wiki Activity

Extract bigtext from notifications

Browse Source
This commit is contained in:
Nicolas Fella 2019-05-24 11:27:08 +00:00
parent 35635a0b0b
commit db0c48cc6b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
View File

@ -304,17 +304,27 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
np.set("title", notification.extras.getString(Notification.EXTRA_TITLE)); np.set("title", notification.extras.getString(Notification.EXTRA_TITLE));
} }
if (conversation.second != null) { np.set("text", extractText(notification, conversation));
np.set("text", conversation.second);
} else {
np.set("text", notification.extras.getString(Notification.EXTRA_TEXT));
}
} }
} }
device.sendPacket(np); device.sendPacket(np);
} }
@RequiresApi(api = Build.VERSION_CODES.KITKAT)
private String extractText(Notification notification, Pair<String, String> conversation) {
if (conversation.second != null) {
return conversation.second;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && notification.extras.containsKey(Notification.EXTRA_BIG_TEXT)) {
return extractStringFromExtra(notification.extras, Notification.EXTRA_BIG_TEXT);
}
return notification.extras.getString(Notification.EXTRA_TEXT);
}
private Pair<String, String> extractConversation(Notification notification) { private Pair<String, String> extractConversation(Notification notification) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
return new Pair<>(null, null); return new Pair<>(null, null);