From fded427ac4d839e78f529f0b51602b72cfceba68 Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Mon, 30 Jun 2025 18:46:21 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICH95I Testing: all pre-merge tests passed Co-authored-by: IvanTyulyandin Signed-off-by: igorlegalov --- .../ets/ets/@ohos.notificationManager.ets | 246 +++++++++--------- .../ets/ets/@ohos.notificationSubscribe.ets | 36 +-- .../ets/notification/notificationContent.ets | 2 +- 3 files changed, 142 insertions(+), 142 deletions(-) diff --git a/frameworks/ets/ets/@ohos.notificationManager.ets b/frameworks/ets/ets/@ohos.notificationManager.ets index 3bd9e4e93..afac47f09 100644 --- a/frameworks/ets/ets/@ohos.notificationManager.ets +++ b/frameworks/ets/ets/@ohos.notificationManager.ets @@ -176,7 +176,7 @@ export default namespace notificationManager { export native function nativeIsNotificationEnabledSync(): boolean; export native function nativeRemoveGroupByBundle(bundle: BundleOption, groupName: string): void; - + export native function nativeAddSlotByNotificationSlot(slot: NotificationSlot): void; export native function nativeAddSlotBySlotType(type: SlotType): void; export native function nativeAddSlots(slots: Array): void; @@ -447,7 +447,7 @@ export default namespace notificationManager { if (systemLiveView?.button?.iconsResource != undefined && systemLiveView?.button?.iconsResource?.length === 0) { return false; } - + if (systemLiveView?.cardButtons !== undefined && systemLiveView?.cardButtons?.length === 0) { return false; } @@ -647,7 +647,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): long => { return nativeGetSlotNumByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; resolve(ret); }, (error: Error): void => { @@ -666,7 +666,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): long => { return nativeGetSlotNumByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; callback(null, ret); }, (error: Error): void => { @@ -688,7 +688,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeSetSlotByBundle(bundle, slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -707,7 +707,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetSlotByBundle(bundle, slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -721,7 +721,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeRemoveAllSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -732,7 +732,7 @@ export default namespace notificationManager { export function removeAllSlots(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeRemoveAllSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -746,7 +746,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeRemoveSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -757,7 +757,7 @@ export default namespace notificationManager { export function removeSlot(slotType: SlotType): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeRemoveSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -769,7 +769,7 @@ export default namespace notificationManager { export function getSlots(): Promise> { let pPromise = new Promise>((resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; resolve(ret); }, (error: Error): void => { @@ -784,7 +784,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; callback(null, ret); }, (error: Error): void => { @@ -796,7 +796,7 @@ export default namespace notificationManager { export function getSlot(slotType: SlotType): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationSlot => { return nativeGetSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSlot = data as NotificationSlot; resolve(ret); }, (error: Error): void => { @@ -811,7 +811,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): NotificationSlot => { return nativeGetSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSlot = data as NotificationSlot; callback(null, ret); }, (error: Error): void => { @@ -827,7 +827,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationSlot => { return nativeGetSlotByBundle(bundle, slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSlot = data as NotificationSlot; resolve(ret); }, (error: Error): void => { @@ -843,7 +843,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeAddSlots(slots); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -860,7 +860,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeAddSlots(slots); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -875,7 +875,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeAddSlotByNotificationSlot(slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -893,7 +893,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeAddSlotByNotificationSlot(slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -906,7 +906,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeAddSlotBySlotType(type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -917,7 +917,7 @@ export default namespace notificationManager { export function addSlot(type: SlotType): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeAddSlotBySlotType(type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -934,7 +934,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetNotificationEnable(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -953,7 +953,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeSetNotificationEnable(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -971,7 +971,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithBundleOption(bundleOption); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -990,7 +990,7 @@ export default namespace notificationManager { let p = taskpool.execute( (): boolean => { return nativeIsNotificationEnabledWithBundleOption(bundleOption); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1006,7 +1006,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1019,7 +1019,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1035,7 +1035,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1048,7 +1048,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1075,7 +1075,7 @@ export default namespace notificationManager { let p = taskpool.execute( (): void => { return nativeSetNotificationEnableSlotWithForce(bundle, type, enable, isForceControl); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1098,7 +1098,7 @@ export default namespace notificationManager { let p = taskpool.execute( (): void => { return nativeSetNotificationEnableSlotWithForce(bundle, type, enable, forceControl); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1118,7 +1118,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeSetNotificationEnableSlot(bundle, type, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1134,7 +1134,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsNotificationSlotEnabled(bundle, type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1154,7 +1154,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationSlotEnabled(bundle, type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1173,7 +1173,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetSlotsByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let slots : Array = data as Array; callback(null, slots); }, (error: Error): void => { @@ -1191,7 +1191,7 @@ export default namespace notificationManager { let pPromise = new Promise>( (resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetSlotsByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let slots : Array = data as Array; resolve(slots); }, (error: Error): void => { @@ -1208,7 +1208,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetSlotFlagsByBundle(bundle, slotFlags); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1224,7 +1224,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): long => { return nativeGetSlotFlagsByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; resolve(ret); }, (error: Error): void => { @@ -1243,7 +1243,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativePublish(request); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1258,7 +1258,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativePublish(request); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1276,7 +1276,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativePublishWithUserId(request, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1291,7 +1291,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativePublishWithUserId(request, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1315,7 +1315,7 @@ export default namespace notificationManager { let p = taskpool.execute((): void => { return nativeTriggerSystemLiveView(bundle, notificationId, buttonOptions); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1331,7 +1331,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSubscribeSystemLiveView(subscriber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1346,7 +1346,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeRemoveDoNotDisturbProfile(templates); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1361,7 +1361,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeAddDoNotDisturbProfile(templates); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1375,7 +1375,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetAllActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; callback(null, ret); }, (error: Error): void => { @@ -1389,7 +1389,7 @@ export default namespace notificationManager { = new Promise>( (resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetAllActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; resolve(ret); }, (error: Error): void => { @@ -1402,7 +1402,7 @@ export default namespace notificationManager { export function getActiveNotifications(): Promise> { let pPromise = new Promise>((resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; resolve(ret); }, (error: Error): void => { @@ -1417,7 +1417,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; callback(null, ret); }, (error: Error): void => { @@ -1432,7 +1432,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): long => { return nativeGetActiveNotificationCount(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; callback(null, ret); }, (error: Object): void => { @@ -1444,7 +1444,7 @@ export default namespace notificationManager { export function getActiveNotificationCount(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback):void => { let p = taskpool.execute((): long => { return nativeGetActiveNotificationCount(); }); - p.then((data :NullishType): void => { + p.then((data :Any): void => { let ret : long = data as long; resolve(ret); }, (err:Error): void => { @@ -1463,7 +1463,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeDisplayBadge(bundle, enable); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1478,7 +1478,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeDisplayBadge(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1493,7 +1493,7 @@ export default namespace notificationManager { throw error; } let p = taskpool.execute((): boolean => { return nativeIsBadgeDisplayed(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1509,7 +1509,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsBadgeDisplayed(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1526,7 +1526,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeCancelWithBundle(bundle, id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1541,7 +1541,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeCancelWithIdOptionalLabel(id, label); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1558,7 +1558,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeCancelWithIdLabel(id, label); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1571,7 +1571,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeCancelWithId(id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1582,7 +1582,7 @@ export default namespace notificationManager { export function cancelAll(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeCancelAll(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1596,7 +1596,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeCancelAll(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1612,7 +1612,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): Promise => { return nativeRequestEnableNotification(context); }); p.then( - (data: NullishType): void => { + (data: Any): void => { if (data == undefined) { reject(rejectInternalError); } else { @@ -1639,7 +1639,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): Promise => { return nativeRequestEnableNotification(context); }); p.then( - (data: NullishType): void => { + (data: Any): void => { if (data == undefined) { callback(callbackInternalError, undefined); } else { @@ -1689,7 +1689,7 @@ export default namespace notificationManager { }; let p = callback(checkInfo); await p.then( - (e: NullishType): void => { + (e: Any): void => { result = e as notificationManager.NotificationCheckResult; }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1750,7 +1750,7 @@ export default namespace notificationManager { let pPromise = new Promise>( (resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetAllNotificationEnabledBundles(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let options : Array = data as Array; resolve(options); }, (error: Error): void => { @@ -1771,7 +1771,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeSetBadgeNumber(badgeNumber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -1782,7 +1782,7 @@ export default namespace notificationManager { export function setBadgeNumber(badgeNumber: int): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetBadgeNumber(badgeNumber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1799,7 +1799,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetBadgeNumberByBundle(bundle, badgeNumber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1807,7 +1807,7 @@ export default namespace notificationManager { }); return pPromise; } - + export function getActiveNotificationByFilter(filter: NotificationFilter, callback: AsyncCallback): void { let error: BusinessError = isInvalidParameter(filter); @@ -1818,7 +1818,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): NotificationRequest => { return nativeGetActiveNotificationByFilter(filter); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationRequest = data as NotificationRequest; callback(null, ret); }, (error: Object): void => { @@ -1835,7 +1835,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationRequest => { return nativeGetActiveNotificationByFilter(filter); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationRequest = data as NotificationRequest; resolve(ret); }, (error: Error): void => { @@ -1844,12 +1844,12 @@ export default namespace notificationManager { }); return pPromise; } - + export function isSupportTemplate(templateName: string): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsSupportTemplate(templateName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1872,7 +1872,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeRemoveGroupByBundle(bundle, groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1891,7 +1891,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeRemoveGroupByBundle(bundle, groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1914,7 +1914,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativePublishAsBundle(request, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -1933,7 +1933,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativePublishAsBundle(request, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1954,7 +1954,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativePublishAsBundleWithBundleOption(representativeBundle, request); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1972,7 +1972,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeCancelAsBundle(id, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1987,7 +1987,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeCancelAsBundle(id, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2005,7 +2005,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeCancelAsBundleWithBundleOption(representativeBundle, id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2023,7 +2023,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeCancelGroup(groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2038,7 +2038,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeCancelGroup(groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2057,7 +2057,7 @@ export default namespace notificationManager { throw error; } let p = taskpool.execute((): void => { return nativeSetDoNotDisturbDate(date); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2073,7 +2073,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetDoNotDisturbDate(date); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2092,7 +2092,7 @@ export default namespace notificationManager { throw error; } let p = taskpool.execute((): void => { return nativeSetDoNotDisturbDateWithId(date, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2108,7 +2108,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetDoNotDisturbDateWithId(date, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2123,7 +2123,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDate(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; callback(null, doNotDisturbDate); }, (error: Object): void => { @@ -2136,7 +2136,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDate(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; resolve(doNotDisturbDate); }, (error: Error): void => { @@ -2152,7 +2152,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDateWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; callback(null, doNotDisturbDate); }, (error: Object): void => { @@ -2165,7 +2165,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDateWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; resolve(doNotDisturbDate); }, (error: Error): void => { @@ -2181,7 +2181,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsSupportDoNotDisturbMode(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Object): void => { @@ -2196,7 +2196,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsSupportTemplate(templateName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Object): void => { @@ -2209,7 +2209,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsSupportDoNotDisturbMode(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2223,7 +2223,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DoNotDisturbProfile => { return nativeGetDoNotDisturbProfile(id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : DoNotDisturbProfile = data as DoNotDisturbProfile; resolve(ret); }, (error: Error): void => { @@ -2241,7 +2241,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): Promise => { return nativeOpenNotificationSettings(context); }); p.then( - (data: NullishType): void => { + (data: Any): void => { if (data == undefined) { reject(rejectInternalError); } else { @@ -2264,7 +2264,7 @@ export default namespace notificationManager { export function setTargetDeviceStatus(deviceType: string, status: long): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativesetTargetDeviceStatus(deviceType,status); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2281,7 +2281,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativesetDistributedEnabledByBundle(bundle, deviceType, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2299,7 +2299,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativesetDistributedEnableByBundle(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2312,7 +2312,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativesetSmartReminderEnabled(deviceType, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2325,7 +2325,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeisSmartReminderEnabled(deviceType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2339,9 +2339,9 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { - return nativesetDistributedEnabledBySlot(slot, deviceType, enabled); + return nativesetDistributedEnabledBySlot(slot, deviceType, enabled); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2354,7 +2354,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeisDistributedEnabledBySlot(slot, deviceType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2367,7 +2367,7 @@ export default namespace notificationManager { export function setAdditionalConfig(key: string, value: string): Promise{ let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return nativesetAdditionalConfig(key,value); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : int = data as int; resolve(ret); }, (error: Error): void => { @@ -2382,7 +2382,7 @@ export default namespace notificationManager { let p = taskpool.execute((): void => { return nativedisableNotificationFeature(disabled,bundleList); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2401,7 +2401,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativesetDistributedEnableByBundle(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2415,7 +2415,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { return nativeSetDistributedEnable(enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2427,7 +2427,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetDistributedEnable(enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2440,7 +2440,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2449,14 +2449,14 @@ export default namespace notificationManager { }); return pPromise; } - + export function isDistributedEnabled(callback: AsyncCallback): void { if (callback == null) { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -2473,7 +2473,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2494,7 +2494,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -2502,7 +2502,7 @@ export default namespace notificationManager { callback(err, undefined); }) } - + export function isDistributedEnabledByBundle(bundle: BundleOption, deviceType: string): Promise { let error: BusinessError = isInvalidParameter(bundle); @@ -2511,7 +2511,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundleType(bundle, deviceType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2526,7 +2526,7 @@ export default namespace notificationManager { let pPromise = new Promise( (resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DeviceRemindType => { return nativeGetDeviceRemindType(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : DeviceRemindType = data as DeviceRemindType; resolve(ret); }, (error: Error): void => { @@ -2542,7 +2542,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): DeviceRemindType => { return nativeGetDeviceRemindType(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : DeviceRemindType = data as DeviceRemindType; callback(null, ret); }, (error: Error): void => { @@ -2559,7 +2559,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetSyncNotificationEnabledWithoutApp(userId, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -2572,7 +2572,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return nativeSetSyncNotificationEnabledWithoutApp(userId, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2585,7 +2585,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeGetSyncNotificationEnabledWithoutApp(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2601,7 +2601,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeGetSyncNotificationEnabledWithoutApp(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { diff --git a/frameworks/ets/ets/@ohos.notificationSubscribe.ets b/frameworks/ets/ets/@ohos.notificationSubscribe.ets index 7e5e27d16..c4d2e1b3a 100644 --- a/frameworks/ets/ets/@ohos.notificationSubscribe.ets +++ b/frameworks/ets/ets/@ohos.notificationSubscribe.ets @@ -90,7 +90,7 @@ export default namespace notificationSubscribe { } let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber) }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -108,7 +108,7 @@ export default namespace notificationSubscribe { } let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber, info) }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -123,7 +123,7 @@ export default namespace notificationSubscribe { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void =>{ let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber, info)}); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -139,7 +139,7 @@ export default namespace notificationSubscribe { } let p = taskpool.execute((): void => { notificationSubscribe.nativeUnSubscribe(subscriber) }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -155,7 +155,7 @@ export default namespace notificationSubscribe { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void =>{ let p = taskpool.execute((): void => { notificationSubscribe.nativeUnSubscribe(subscriber) }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -178,7 +178,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(bundle, notificationKey, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -200,7 +200,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(bundle, notificationKey, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -218,7 +218,7 @@ export default namespace notificationSubscribe { return notificationSubscribe.nativeRemove(hashCode, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -236,7 +236,7 @@ export default namespace notificationSubscribe { return notificationSubscribe.nativeRemove(hashCode, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -254,7 +254,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(hashCodes, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -272,7 +272,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(hashCodes, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -295,7 +295,7 @@ export default namespace notificationSubscribe { } }); p.then( - (e: NullishType): void => { + (e: Any): void => { if (e == undefined) { reject(rejectInternalError); } @@ -330,7 +330,7 @@ export default namespace notificationSubscribe { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void =>{ let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribeSelf(subscriber)}); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -352,7 +352,7 @@ export default namespace notificationSubscribe { return notificationSubscribe.nativeRemoveAllForBundle(bundle); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -371,7 +371,7 @@ export default namespace notificationSubscribe { return notificationSubscribe.nativeRemoveAllForBundle(bundle); } }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -388,7 +388,7 @@ export default namespace notificationSubscribe { return notificationSubscribe.nativeRemoveAll(); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -405,7 +405,7 @@ export default namespace notificationSubscribe { return notificationSubscribe.nativeRemoveAllForUserId(userId); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -417,7 +417,7 @@ export default namespace notificationSubscribe { export function removeAll(userId: int): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { return notificationSubscribe.nativeRemoveAllForUserId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); diff --git a/frameworks/ets/ets/notification/notificationContent.ets b/frameworks/ets/ets/notification/notificationContent.ets index 500b35fcf..df02c2049 100644 --- a/frameworks/ets/ets/notification/notificationContent.ets +++ b/frameworks/ets/ets/notification/notificationContent.ets @@ -20,7 +20,7 @@ import type notificationManager from '@ohos.notificationManager'; type IconType = Resource | image.PixelMap; class RecordTools { - public static GetKeys(record: Record): Array { + public static GetKeys(record: Record): Array { try { let keys: Array = Object.keys(record); return keys; -- Gitee