Changeset View
Changeset View
Standalone View
Standalone View
src/notifybyandroid.cpp
Show First 20 Lines • Show All 104 Lines • ▼ Show 20 Line(s) | 102 | { | |||
---|---|---|---|---|---|
105 | n.setField("id", notification->id()); | 105 | n.setField("id", notification->id()); | ||
106 | n.setField("text", QAndroidJniObject::fromString(stripRichText(notification->text())).object<jstring>()); | 106 | n.setField("text", QAndroidJniObject::fromString(stripRichText(notification->text())).object<jstring>()); | ||
107 | n.setField("title", QAndroidJniObject::fromString(stripRichText(notification->title())).object<jstring>()); | 107 | n.setField("title", QAndroidJniObject::fromString(stripRichText(notification->title())).object<jstring>()); | ||
108 | 108 | | |||
109 | n.setField("channelId", QAndroidJniObject::fromString(notification->eventId()).object<jstring>()); | 109 | n.setField("channelId", QAndroidJniObject::fromString(notification->eventId()).object<jstring>()); | ||
110 | n.setField("channelName", QAndroidJniObject::fromString(config->readEntry(QLatin1String("Name"))).object<jstring>()); | 110 | n.setField("channelName", QAndroidJniObject::fromString(config->readEntry(QLatin1String("Name"))).object<jstring>()); | ||
111 | n.setField("channelDescription", QAndroidJniObject::fromString(config->readEntry(QLatin1String("Comment"))).object<jstring>()); | 111 | n.setField("channelDescription", QAndroidJniObject::fromString(config->readEntry(QLatin1String("Comment"))).object<jstring>()); | ||
112 | 112 | | |||
113 | if ((notification->flags() & KNotification::SkipGrouping) == 0) { | ||||
114 | n.setField("group", QAndroidJniObject::fromString(notification->eventId()).object<jstring>()); | ||||
115 | } | ||||
116 | | ||||
113 | // icon | 117 | // icon | ||
114 | QPixmap pixmap; | 118 | QPixmap pixmap; | ||
115 | if (!notification->iconName().isEmpty()) { | 119 | if (!notification->iconName().isEmpty()) { | ||
116 | const auto icon = QIcon::fromTheme(notification->iconName()); | 120 | const auto icon = QIcon::fromTheme(notification->iconName()); | ||
117 | pixmap = icon.pixmap(32, 32); | 121 | pixmap = icon.pixmap(32, 32); | ||
118 | } else { | 122 | } else { | ||
119 | pixmap = notification->pixmap(); | 123 | pixmap = notification->pixmap(); | ||
120 | } | 124 | } | ||
Show All 27 Lines | |||||
148 | void NotifyByAndroid::update(KNotification *notification, KNotifyConfig *config) | 152 | void NotifyByAndroid::update(KNotification *notification, KNotifyConfig *config) | ||
149 | { | 153 | { | ||
150 | const auto n = createAndroidNotification(notification, config); | 154 | const auto n = createAndroidNotification(notification, config); | ||
151 | m_backend.callMethod<void>("notify", "(Lorg/kde/knotifications/KNotification;)V", n.object<jobject>()); | 155 | m_backend.callMethod<void>("notify", "(Lorg/kde/knotifications/KNotification;)V", n.object<jobject>()); | ||
152 | } | 156 | } | ||
153 | 157 | | |||
154 | void NotifyByAndroid::close(KNotification* notification) | 158 | void NotifyByAndroid::close(KNotification* notification) | ||
155 | { | 159 | { | ||
156 | m_backend.callMethod<void>("close", "(I)V", notification->id()); | 160 | m_backend.callMethod<void>("close", "(ILjava/lang/String;)V", notification->id(), QAndroidJniObject::fromString(notification->eventId()).object<jstring>()); | ||
157 | KNotificationPlugin::close(notification); | 161 | KNotificationPlugin::close(notification); | ||
158 | } | 162 | } | ||
159 | 163 | | |||
160 | void NotifyByAndroid::notificationFinished(int id) | 164 | void NotifyByAndroid::notificationFinished(int id) | ||
161 | { | 165 | { | ||
162 | qCDebug(LOG_KNOTIFICATIONS) << id; | 166 | qCDebug(LOG_KNOTIFICATIONS) << id; | ||
163 | const auto it = m_notifications.find(id); | 167 | const auto it = m_notifications.find(id); | ||
164 | if (it == m_notifications.end()) { | 168 | if (it == m_notifications.end()) { | ||
Show All 13 Lines |