Skip to content

Commit 65d280f

Browse files
notif [nfc]: Remove unused AndroidIntent.extras
1 parent 7eb413b commit 65d280f

File tree

6 files changed

+4
-17
lines changed

6 files changed

+4
-17
lines changed

android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ data class NotificationChannel (
9999
data class AndroidIntent (
100100
val action: String,
101101
val dataUrl: String,
102-
val extras: Map<String?, String?>,
103102
/** A combination of flags from [IntentFlag]. */
104103
val flags: Long
105104

@@ -109,16 +108,14 @@ data class AndroidIntent (
109108
fun fromList(__pigeon_list: List<Any?>): AndroidIntent {
110109
val action = __pigeon_list[0] as String
111110
val dataUrl = __pigeon_list[1] as String
112-
val extras = __pigeon_list[2] as Map<String?, String?>
113-
val flags = __pigeon_list[3].let { num -> if (num is Int) num.toLong() else num as Long }
114-
return AndroidIntent(action, dataUrl, extras, flags)
111+
val flags = __pigeon_list[2].let { num -> if (num is Int) num.toLong() else num as Long }
112+
return AndroidIntent(action, dataUrl, flags)
115113
}
116114
}
117115
fun toList(): List<Any?> {
118116
return listOf(
119117
action,
120118
dataUrl,
121-
extras,
122119
flags,
123120
)
124121
}

android/app/src/main/kotlin/com/zulip/flutter/ZulipPlugin.kt

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ private class AndroidNotificationHost(val context: Context)
104104
context,
105105
MainActivity::class.java
106106
).apply {
107-
intent.extras.forEach { (k, v) -> putExtra(k!!, v!!) }
108107
flags = intent.flags.toInt()
109108
} },
110109
it.flags.toInt())

lib/host/android_notifications.g.dart

+1-6
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,20 @@ class AndroidIntent {
7272
AndroidIntent({
7373
required this.action,
7474
required this.dataUrl,
75-
required this.extras,
7675
this.flags = 0,
7776
});
7877

7978
String action;
8079

8180
String dataUrl;
8281

83-
Map<String?, String?> extras;
84-
8582
/// A combination of flags from [IntentFlag].
8683
int flags;
8784

8885
Object encode() {
8986
return <Object?>[
9087
action,
9188
dataUrl,
92-
extras,
9389
flags,
9490
];
9591
}
@@ -99,8 +95,7 @@ class AndroidIntent {
9995
return AndroidIntent(
10096
action: result[0]! as String,
10197
dataUrl: result[1]! as String,
102-
extras: (result[2] as Map<Object?, Object?>?)!.cast<String?, String?>(),
103-
flags: result[3]! as int,
98+
flags: result[2]! as int,
10499
);
105100
}
106101
}

lib/notifications/display.dart

-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ class NotificationDisplayManager {
196196
intent: AndroidIntent(
197197
action: IntentAction.view,
198198
dataUrl: intentDataUrl.toString(),
199-
extras: {},
200199
// See these sections in the Android docs:
201200
// https://developer.android.com/guide/components/activities/tasks-and-back-stack#TaskLaunchModes
202201
// https://developer.android.com/reference/android/content/Intent#FLAG_ACTIVITY_CLEAR_TOP

pigeon/notifications.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@ class NotificationChannel {
4242
/// https://developer.android.com/reference/android/content/Intent
4343
/// https://developer.android.com/reference/android/content/Intent#Intent(java.lang.String,%20android.net.Uri,%20android.content.Context,%20java.lang.Class%3C?%3E)
4444
class AndroidIntent {
45-
AndroidIntent({required this.action, required this.dataUrl, required this.extras, this.flags = 0});
45+
AndroidIntent({required this.action, required this.dataUrl, this.flags = 0});
4646

4747
final String action;
4848
final String dataUrl;
49-
final Map<String?, String?> extras;
5049

5150
/// A combination of flags from [IntentFlag].
5251
final int flags;

test/notifications/display_test.dart

-2
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ void main() {
286286
..intent.which((it) => it
287287
..action.equals(IntentAction.view)
288288
..dataUrl.equals(expectedIntentDataUrl.toString())
289-
..extras.deepEquals({})
290289
..flags.equals(expectedIntentFlags))),
291290
(it) => it.isA<AndroidNotificationHostApiNotifyCall>()
292291
..id.equals(NotificationDisplayManager.notificationIdAsHashOf(expectedGroupKey))
@@ -1219,7 +1218,6 @@ extension on Subject<PendingIntent> {
12191218
extension on Subject<AndroidIntent> {
12201219
Subject<String> get action => has((x) => x.action, 'action');
12211220
Subject<String> get dataUrl => has((x) => x.dataUrl, 'dataUrl');
1222-
Subject<Map<String?, String?>> get extras => has((x) => x.extras, 'extras');
12231221
Subject<int> get flags => has((x) => x.flags, 'flags');
12241222
}
12251223

0 commit comments

Comments
 (0)