Skip to content

Commit 9812b03

Browse files
committed
notif: Use live value for app ID on registering APNs token
Fixes #407
1 parent 16e4d88 commit 9812b03

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

Diff for: lib/model/binding.dart

+3
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,12 @@ class LinuxDeviceInfo implements BaseDeviceInfo {
303303
class PackageInfo {
304304
final String version;
305305
final String buildNumber;
306+
final String packageName;
306307

307308
const PackageInfo({
308309
required this.version,
309310
required this.buildNumber,
311+
required this.packageName
310312
});
311313
}
312314

@@ -411,6 +413,7 @@ class LiveZulipBinding extends ZulipBinding {
411413
_syncPackageInfo = PackageInfo(
412414
version: info.version,
413415
buildNumber: info.buildNumber,
416+
packageName: info.packageName
414417
);
415418
} catch (e, st) {
416419
assert(debugLog('Failed to prefetch package info: $e\n$st')); // TODO(log)

Diff for: lib/notifications/receive.dart

+6-3
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,12 @@ class NotificationService {
149149
await addFcmToken(connection, token: token);
150150

151151
case TargetPlatform.iOS:
152-
const appBundleId = 'com.zulip.flutter'; // TODO(#407) find actual value live
153-
await addApnsToken(connection, token: token, appid: appBundleId);
154-
152+
final packageInfo = await ZulipBinding.instance.packageInfo;
153+
if (packageInfo == null) {
154+
assert(debugLog('missing packageInfo')); // TODO(log)
155+
}
156+
await addApnsToken(connection, token: token,
157+
appid: packageInfo?.packageName ?? 'com.zulip.flutter');
155158
case TargetPlatform.linux:
156159
case TargetPlatform.macOS:
157160
case TargetPlatform.windows:

Diff for: test/model/binding.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ class TestZulipBinding extends ZulipBinding {
231231

232232
/// The value that `ZulipBinding.instance.packageInfo` should return.
233233
PackageInfo packageInfoResult = _defaultPackageInfo;
234-
static const _defaultPackageInfo = PackageInfo(version: '0.0.1', buildNumber: '1');
234+
static const _defaultPackageInfo = PackageInfo(version: '0.0.1',
235+
buildNumber: '1', packageName: 'com.zulip.flutter');
235236

236237
void _resetPackageInfo() {
237238
packageInfoResult = _defaultPackageInfo;

0 commit comments

Comments
 (0)