diff --git a/frameworks/ets/ets/@ohos.notificationManager.ets b/frameworks/ets/ets/@ohos.notificationManager.ets index 1bd0e6d84443b487e9ee475f9ba542d95b7dc582..d7606aceadd60811e970347bdff406ca6d2bacde 100644 --- a/frameworks/ets/ets/@ohos.notificationManager.ets +++ b/frameworks/ets/ets/@ohos.notificationManager.ets @@ -678,8 +678,7 @@ export default namespace notificationManager { let p = taskpool.execute((): number => { return nativeGetSlotNumByBundle(bundle); }); p.then((data: NullishType): void => { let ret : number = data as number; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret: number = -1; let err: BusinessError = error as BusinessError; @@ -701,8 +700,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetSlotByBundle(bundle, slot); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -735,8 +733,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeRemoveAllSlots(); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -761,8 +758,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeRemoveSlot(slotType); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -801,8 +797,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetSlots(); }); p.then((data: NullishType): void => { let ret : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : Array = []; let err: BusinessError = error as BusinessError; @@ -830,8 +825,7 @@ export default namespace notificationManager { let p = taskpool.execute((): NotificationSlot => { return nativeGetSlot(slotType); }); p.then((data: NullishType): void => { let ret : NotificationSlot = data as NotificationSlot; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : NotificationSlot = { enabled: false, reminderMode: 0, authorizedStatus: 0 } as NotificationSlot; let err: BusinessError = error as BusinessError; @@ -863,8 +857,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeAddSlots(slots); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -897,8 +890,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeAddSlotByNotificationSlot(slot); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -911,8 +903,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeAddSlotBySlotType(type); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -959,8 +950,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetNotificationEnable(bundle, enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -979,8 +969,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithBundleOption(bundleOption); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -1016,8 +1005,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithId(userId); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -1047,8 +1035,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabled(); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -1088,8 +1075,7 @@ export default namespace notificationManager { (): void => { return nativeSetNotificationEnableSlotWithForce(bundle, type, enable, isForceControl); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1132,8 +1118,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetNotificationEnableSlot(bundle, type, enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1170,8 +1155,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationSlotEnabled(bundle, type); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -1191,8 +1175,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetSlotsByBundle(bundle); }); p.then((data: NullishType): void => { let slots : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, slots); + callback(null, slots); }, (error: Error): void => { let slots : Array = []; let err: BusinessError = error as BusinessError; @@ -1262,8 +1245,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativePublish(request); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1296,8 +1278,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativePublishWithUserId(request, userId); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1397,8 +1378,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetAllActiveNotifications(); }); p.then((data: NullishType): void => { let ret : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let retData : Array = []; let err: BusinessError = error as BusinessError; @@ -1441,8 +1421,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetActiveNotifications(); }); p.then((data: NullishType): void => { let ret : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let retData : Array = []; let err: BusinessError = error as BusinessError; @@ -1458,8 +1437,7 @@ export default namespace notificationManager { let p = taskpool.execute((): number => { return nativeGetActiveNotificationCount(); }); p.then((data: NullishType): void => { let ret : number = data as number; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, -1); @@ -1489,8 +1467,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeDisplayBadge(bundle, enable); }); p.then((e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1521,8 +1498,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsBadgeDisplayed(bundle); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -1587,8 +1563,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelWithIdLabel(id, label); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1601,8 +1576,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelWithId(id); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1627,8 +1601,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelAll(); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1676,7 +1649,7 @@ export default namespace notificationManager { } else { let result: int = data as int; if (result == 0) { - callback(successCallbackError, undefined); + callback(null, undefined); } else { callback(callbackInternalError, undefined); } @@ -1803,8 +1776,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetBadgeNumber(badgeNumber); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1852,8 +1824,7 @@ export default namespace notificationManager { let p = taskpool.execute((): NotificationRequest => { return nativeGetActiveNotificationByFilter(filter); }); p.then((data: NullishType): void => { let ret : NotificationRequest = data as NotificationRequest; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let retData: NotificationRequest = { content:{}, @@ -1920,8 +1891,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeRemoveGroupByBundle(bundle, groupName); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1963,8 +1933,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativePublishAsBundle(request, representativeBundle, userId); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2022,8 +1991,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelAsBundle(id, representativeBundle, userId); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2074,8 +2042,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelGroup(groupName); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2109,8 +2076,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetDoNotDisturbDate(date); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2145,8 +2111,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetDoNotDisturbDateWithId(date, userId); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2178,8 +2143,7 @@ export default namespace notificationManager { let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDate(); }); p.then((data: NullishType): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, doNotDisturbDate); + callback(null, doNotDisturbDate); }, (error: Object): void => { let doNotDisturbDate : DoNotDisturbDate = {}; let err: BusinessError = error as BusinessError; @@ -2209,8 +2173,7 @@ export default namespace notificationManager { let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDateWithId(userId); }); p.then((data: NullishType): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, doNotDisturbDate); + callback(null, doNotDisturbDate); }, (error: Object): void => { let doNotDisturbDate : DoNotDisturbDate = {}; let err: BusinessError = error as BusinessError; @@ -2240,8 +2203,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsSupportDoNotDisturbMode(); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -2257,8 +2219,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsSupportTemplate(templateName); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -2463,8 +2424,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativesetDistributedEnableByBundle(bundle, enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2478,8 +2438,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetDistributedEnable(enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2521,8 +2480,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabled(); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -2561,8 +2519,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundle(bundle); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -2611,8 +2568,7 @@ export default namespace notificationManager { let p = taskpool.execute((): DeviceRemindType => { return nativeGetDeviceRemindType(); }); p.then((data: NullishType): void => { let ret : DeviceRemindType = data as DeviceRemindType; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { const defaultRemindType: DeviceRemindType = DeviceRemindType.IDLE_DONOT_REMIND; let err: BusinessError = error as BusinessError; @@ -2629,8 +2585,7 @@ export default namespace notificationManager { let p = taskpool.execute((): void => { return nativeSetSyncNotificationEnabledWithoutApp(userId, enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -2673,8 +2628,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeGetSyncNotificationEnabledWithoutApp(userId); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Error): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; diff --git a/frameworks/ets/ets/@ohos.notificationSubscribe.ets b/frameworks/ets/ets/@ohos.notificationSubscribe.ets index d3ad2cbc96bf0e727df414f55ba7a1632a3ac3df..1f42a216f1bfba7b32b814976c0c8faba4a91562 100644 --- a/frameworks/ets/ets/@ohos.notificationSubscribe.ets +++ b/frameworks/ets/ets/@ohos.notificationSubscribe.ets @@ -91,8 +91,7 @@ export default namespace notificationSubscribe { let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber) }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -110,8 +109,7 @@ export default namespace notificationSubscribe { let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber, info) }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -142,8 +140,7 @@ export default namespace notificationSubscribe { let p = taskpool.execute((): void => { notificationSubscribe.nativeUnSubscribe(subscriber) }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -182,8 +179,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -223,8 +219,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -260,8 +255,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -359,8 +353,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -396,8 +389,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -414,8 +406,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined);