diff --git a/interfaces/kits/ani/webview/ets/@ohos.web.webview.ets b/interfaces/kits/ani/webview/ets/@ohos.web.webview.ets index 63fd68044f48aa1897e7c94742d11e4628d3a63d..c6b64600507a988cc750e2d6b7286b1964e3d8ac 100644 --- a/interfaces/kits/ani/webview/ets/@ohos.web.webview.ets +++ b/interfaces/kits/ani/webview/ets/@ohos.web.webview.ets @@ -172,7 +172,7 @@ export default namespace webview { VIDEO = 0, AUDIO = 1 } - + export enum WebResourceType{ MAIN_FRAME = 0, SUB_FRAME = 1, @@ -834,13 +834,13 @@ export default namespace webview { hasImage(): Promise { return this.hasImagePromise(); } - native getCertificateSync(): Array; + native getCertificateSync(): Array; getCertificate(): Promise> { let certChainData = this.getCertificateSync(); return new Promise>((resolve, reject) => { let taskPromise = taskpool.execute(():undefined => { return undefined}); - taskPromise.then(async (results: NullishType) => { + taskPromise.then(async (results: Any) => { const certs: Array = []; for (let i = 0; i < certChainData.length; i++) { let certsUint8Array = new Uint8Array(certChainData[i]); @@ -866,7 +866,7 @@ export default namespace webview { let certChainData = this.getCertificateSync(); let p = taskpool.execute(():undefined => { return undefined}); - p.then((results : NullishType) => { + p.then((results : Any) => { const certs: Array = []; for (let i = 0; i < certChainData.length; i++) { let certsUint8Array = new Uint8Array(certChainData[i]); @@ -945,7 +945,7 @@ export default namespace webview { native setNetErrorCode(code: WebNetErrorList): void; native getNetErrorCode(): WebNetErrorList; } - + export class WebSchemeHandler { private nativePtr: long = 0; private cleaner?: Cleaner; @@ -1020,7 +1020,7 @@ export default namespace webview { } } native constructor(); - + native didReceiveResponse(response: WebSchemeHandlerResponse): void; native didFinish(): void; native didFail(code: WebNetErrorList): void; @@ -1045,7 +1045,7 @@ export default namespace webview { this.registerCleaner(this.nativePtr); } } - + native constructor(); native isChunked(): boolean; native isInMemory(): boolean; @@ -1227,7 +1227,7 @@ export default namespace webview { WebCookieManager.configCookieSync(url, value, false, false); return undefined }); - pCallback.then((e :NullishType)=>{ + pCallback.then((e :Any)=>{ callback(null, undefined); }, (err: Error): void => { let error: BusinessError = err as BusinessError; @@ -1243,7 +1243,7 @@ export default namespace webview { let pPromise1 = taskpool.execute(():undefined => { WebCookieManager.configCookieSync(url, value, false, false); return undefined}); - pPromise1.then((e :NullishType): void=>{ + pPromise1.then((e :Any): void=>{ console.log("in Promise then. e is ", e) resolve(Promise.resolve()); }, (err:Error): void => { @@ -1259,7 +1259,7 @@ export default namespace webview { let pPromise1 = taskpool.execute(():undefined => { WebCookieManager.configCookieSync(url, value, incognito, includeHttpOnly); return undefined}); - pPromise1.then((e :NullishType): void=>{ + pPromise1.then((e :Any): void=>{ console.log("in Promise then. e is ", e) resolve(Promise.resolve()); }, (err:Error): void => { @@ -1283,7 +1283,7 @@ export default namespace webview { reject: (error: Error) => void): void => { let pPromise1 = taskpool.execute(():undefined => { WebCookieManager.saveCookieSync(); return undefined}); - pPromise1.then((e :NullishType): void=>{ + pPromise1.then((e :Any): void=>{ console.log("in Promise then. e is ", e) resolve(undefined); }, (err:Error): void => { @@ -1304,7 +1304,7 @@ export default namespace webview { */ static saveCookieAsync(callback: AsyncCallback): void { let pCallback = taskpool.execute(():undefined => {WebCookieManager.saveCookieSync(); return undefined}); - pCallback.then((e :NullishType)=>{ + pCallback.then((e :Any)=>{ callback(null, undefined); }, (err: Error): void => { let error: BusinessError = err as BusinessError; @@ -1337,7 +1337,7 @@ export default namespace webview { reject: (error: Error) => void): void => { let pPromise1 = taskpool.execute(():undefined => { WebCookieManager.clearAllCookiesSync(); return undefined}); - pPromise1.then((e :NullishType): void=>{ + pPromise1.then((e :Any): void=>{ console.log("in Promise then. e is ", e) resolve(undefined); }, (err:Error): void => { @@ -1360,7 +1360,7 @@ export default namespace webview { static clearAllCookies(callback: AsyncCallback): void { let pCallback = taskpool.execute(():undefined => { WebCookieManager.clearAllCookiesSync(); return undefined}); - pCallback.then((e :NullishType)=>{ + pCallback.then((e :Any)=>{ callback(null, undefined); }, (err: Error): void => { let error: BusinessError = err as BusinessError; @@ -1374,7 +1374,7 @@ export default namespace webview { let pPromise1 = taskpool.execute((): string => { return WebCookieManager.fetchCookieSync(url); }); - pPromise1.then((e: NullishType) => { + pPromise1.then((e: Any) => { let r: string = e as string; resolve(r); }, (error: Error): void => { @@ -1386,7 +1386,7 @@ export default namespace webview { let pCallback = taskpool.execute((): string => { return WebCookieManager.fetchCookieSync(url); }); - pCallback.then((e: NullishType) => { + pCallback.then((e: Any) => { let data: string = e as string; callback(null, data); }, (err: Error): void => { @@ -1397,7 +1397,7 @@ export default namespace webview { static clearSessionCookie(callback: AsyncCallback): void { let pCallback = taskpool.execute(():undefined => {WebCookieManager.clearSessionCookieSync(); return undefined}); - pCallback.then((e :NullishType) => { + pCallback.then((e :Any) => { callback(null, undefined); }, (err: Error): void => { let error: BusinessError = err as BusinessError; @@ -1410,7 +1410,7 @@ export default namespace webview { reject: (error: Error) => void): void => { let pPromise1 = taskpool.execute(():undefined => { WebCookieManager.clearSessionCookieSync(); return undefined}); - pPromise1.then((e: NullishType): void => { + pPromise1.then((e: Any): void => { console.log("in Promise then. e is ", e) resolve(undefined); }, (err: Error): void => { @@ -1425,7 +1425,7 @@ export default namespace webview { let pPromise1 = taskpool.execute((): string => { return WebCookieManager.fetchCookieSync(url, incognito); }); - pPromise1.then((e: NullishType) => { + pPromise1.then((e: Any) => { let r: string = e as string; resolve(r); }, (error: Error): void => { @@ -1646,7 +1646,7 @@ export default namespace webview { let p = new Promise>((resolve: (v: Array) => void, reject: (error: Error) => void) => { let p1 = taskpool.execute(WebStorage.getOriginsSync); - p1.then((e : NullishType) => { + p1.then((e : Any) => { let r = e as Array; resolve(r); }).catch((error: Error): Array => { @@ -1658,7 +1658,7 @@ export default namespace webview { static getOrigins(callback: AsyncCallback>): void { let p = taskpool.execute(WebStorage.getOriginsSync); - p.then((e : NullishType) => { + p.then((e : Any) => { let r = e as Array; let err : BusinessError = new BusinessError(); callback(err, r); @@ -1673,7 +1673,7 @@ export default namespace webview { let p = new Promise((resolve: (v: double) => void, reject: (error: Error) => void) => { let p1 = taskpool.execute(WebStorage.getOriginQuotaSync, origin); - p1.then((e : NullishType) => { + p1.then((e : Any) => { let r = e as double; resolve(r); }).catch((error: Error): double => { @@ -1685,7 +1685,7 @@ export default namespace webview { static getOriginQuota(origin: string, callback: AsyncCallback): void { let p = taskpool.execute(WebStorage.getOriginQuotaSync, origin); - p.then((e : NullishType) => { + p.then((e : Any) => { let r = e as double; let err : BusinessError = new BusinessError(); callback(err, r); @@ -1699,7 +1699,7 @@ export default namespace webview { let p = new Promise((resolve: (v: double) => void, reject: (error: Error) => void) => { let p1 = taskpool.execute(WebStorage.getOriginUsageSync, origin); - p1.then((e : NullishType) => { + p1.then((e : Any) => { let r = e as double; resolve(r); }).catch((error: Error): double => { @@ -1711,7 +1711,7 @@ export default namespace webview { static getOriginUsage(origin: string, callback: AsyncCallback): void { let p = taskpool.execute(WebStorage.getOriginUsageSync, origin); - p.then((e : NullishType) => { + p.then((e : Any) => { let r = e as double; let err : BusinessError = new BusinessError(); callback(err, r); @@ -1828,7 +1828,7 @@ export default namespace webview { let p = new Promise>((resolve: (v: Array) => void, reject: (error: Error) => void) => { let p1 = taskpool.execute(GeolocationPermissions.getOriginsSync,incognitoMode); - p1.then((e : NullishType) => { + p1.then((e : Any) => { let r = e as Array; resolve(r); }).catch((error: Error): Array => { @@ -1845,7 +1845,7 @@ export default namespace webview { incognitoMode = incognito; } let p = taskpool.execute(GeolocationPermissions.getOriginsSync,incognitoMode); - p.then((e : NullishType) => { + p.then((e : Any) => { let r = e as Array; let err: BusinessError = {}; err.code = 0; @@ -1866,7 +1866,7 @@ export default namespace webview { let p = new Promise((resolve: (v: boolean) => void, reject: (error: Error) => void) => { let p1 = taskpool.execute(GeolocationPermissions.getAccessibleGeolocationSync, origin, incognitoMode); - p1.then((e : NullishType) => { + p1.then((e : Any) => { let r = e as boolean; resolve(r); }).catch((error: Error): boolean => { @@ -1883,7 +1883,7 @@ export default namespace webview { incognitoMode = incognito; } let p = taskpool.execute(GeolocationPermissions.getAccessibleGeolocationSync, origin, incognitoMode); - p.then((e : NullishType) => { + p.then((e : Any) => { let r = e as boolean; let err: BusinessError = {}; err.code = 0;