File tree 4 files changed +19
-6
lines changed
4 files changed +19
-6
lines changed Original file line number Diff line number Diff line change @@ -149,7 +149,6 @@ class NotificationService {
149
149
await addFcmToken (connection, token: token);
150
150
151
151
case TargetPlatform .iOS:
152
- // TODO(#407) find actual value live
153
152
await addApnsToken (connection, token: token, appid: (await ZulipBinding .instance.packageInfo)? .packageName ?? "com.zulip.flutter" );
154
153
155
154
case TargetPlatform .linux:
Original file line number Diff line number Diff line change @@ -228,7 +228,7 @@ class TestZulipBinding extends ZulipBinding {
228
228
BaseDeviceInfo ? get syncDeviceInfo => deviceInfoResult;
229
229
230
230
/// The value that `ZulipBinding.instance.packageInfo` should return.
231
- PackageInfo packageInfoResult = _defaultPackageInfo;
231
+ PackageInfo ? packageInfoResult = _defaultPackageInfo;
232
232
static const _defaultPackageInfo = PackageInfo (version: '0.0.1' , buildNumber: '1' , packageName: 'com.zulip.flutter.test' );
233
233
234
234
void _resetPackageInfo () {
@@ -241,6 +241,10 @@ class TestZulipBinding extends ZulipBinding {
241
241
@override
242
242
PackageInfo ? get syncPackageInfo => packageInfoResult;
243
243
244
+ void setPackageInfo (PackageInfo ? packageInfo){
245
+ packageInfoResult= packageInfo;
246
+ }
247
+
244
248
void _resetFirebase () {
245
249
_firebaseInitialized = false ;
246
250
_firebaseMessaging = null ;
@@ -380,7 +384,6 @@ class TestZulipBinding extends ZulipBinding {
380
384
Future <void > toggleWakelock ({required bool enable}) async {
381
385
_wakelockEnabled = enable;
382
386
}
383
-
384
387
}
385
388
386
389
class FakeFirebaseMessaging extends Fake implements FirebaseMessaging {
Original file line number Diff line number Diff line change @@ -1032,7 +1032,7 @@ void main() {
1032
1032
if (defaultTargetPlatform == TargetPlatform .android) {
1033
1033
checkLastRequestFcm (token: '012abc' );
1034
1034
} else {
1035
- checkLastRequestApns (token: '012abc' , appid: ( await testBinding.packageInfo) ? .packageName ?? 'com.zulip.flutter.test' );
1035
+ checkLastRequestApns (token: '012abc' , appid: 'com.zulip.flutter.test' );
1036
1036
}
1037
1037
1038
1038
if (defaultTargetPlatform == TargetPlatform .android) {
@@ -1071,7 +1071,7 @@ void main() {
1071
1071
if (defaultTargetPlatform == TargetPlatform .android) {
1072
1072
checkLastRequestFcm (token: '012abc' );
1073
1073
} else {
1074
- checkLastRequestApns (token: '012abc' , appid: ( await testBinding.packageInfo) ? .packageName ?? 'com.zulip.flutter.test' );
1074
+ checkLastRequestApns (token: '012abc' , appid: 'com.zulip.flutter.test' );
1075
1075
}
1076
1076
1077
1077
if (defaultTargetPlatform == TargetPlatform .android) {
Original file line number Diff line number Diff line change @@ -34,8 +34,19 @@ void main() {
34
34
group ('tokens' , () {
35
35
test ('APNs token registration using correct app bundle ID' , () async {
36
36
await init ();
37
- check ((await testBinding.packageInfo)? .packageName?? 'com.zulip.flutter.test' )
37
+ check ((await testBinding.packageInfo)? .packageName)
38
38
.equals ('com.zulip.flutter.test' );
39
39
}, );
40
+
41
+ test ('Fallback to default appBundleId if packageInfo is null' , () async {
42
+ await init ();
43
+ // setting package Info to null
44
+ testBinding.setPackageInfo (null );
45
+
46
+ const defaultAppId = 'com.zulip.flutter.test' ;
47
+
48
+ check ((await testBinding.packageInfo)? .packageName?? defaultAppId)
49
+ .equals (defaultAppId);
50
+ }, );
40
51
});
41
52
}
You can’t perform that action at this time.
0 commit comments