diff --git a/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/InAppWebViewFlutterPlugin.ets b/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/InAppWebViewFlutterPlugin.ets index f46fbc74fb75349e7a0fabc64fb1ca88bcfcf961..c28f3682c66f6e5854f318d74a0171472a8d3b4e 100644 --- a/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/InAppWebViewFlutterPlugin.ets +++ b/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/InAppWebViewFlutterPlugin.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +import { common } from '@kit.AbilityKit'; import { AbilityAware, AbilityPluginBinding, BinaryMessenger, Log } from '@ohos/flutter_ohos'; import { FlutterAssets, @@ -26,7 +26,6 @@ import FlutterWebViewFactory from './webview/FlutterWebViewFactory'; import { InAppWebViewManager } from './webview/InAppWebViewManager'; import InAppBrowserManager from './in_app_browser/InAppBrowserManager'; import common from '@ohos.app.ability.common'; -import { UIAbility } from '@kit.AbilityKit'; const TAG = "InAppWebViewFlutterPlugin"; @@ -40,17 +39,17 @@ export default class InAppWebViewFlutterPlugin implements FlutterPlugin, Ability public inAppWebViewManager: InAppWebViewManager | null = null; public inAppBrowserManager: InAppBrowserManager | null = null; public applicationContext: common.Context | null = null - public uiAbility: UIAbility | null = null; + public context: common.UIAbilityContext | null = null; constructor() { } onAttachedToAbility(binding: AbilityPluginBinding): void { - this.uiAbility = binding.getAbility() + this.context = binding.getAbilityContext() } onDetachedFromAbility(): void { - this.uiAbility = null; + this.context = null; } getUniqueClassName(): string { diff --git a/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/in_app_browser/InAppBrowserManager.ets b/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/in_app_browser/InAppBrowserManager.ets index b75e052163c89f7f396aad72019dc7eea8075997..3faaefc6129e9eba545fd4c44f244b717776e0df 100644 --- a/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/in_app_browser/InAppBrowserManager.ets +++ b/flutter_inappwebview_ohos/ohos/src/main/ets/components/plugin/in_app_browser/InAppBrowserManager.ets @@ -18,7 +18,7 @@ import ChannelDelegateImpl from '../types/ChannelDelegateImpl'; import { util } from '@kit.ArkTS'; import { Any, Log, MethodCall, MethodChannel } from '@ohos/flutter_ohos'; import { MethodResult } from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodChannel'; -import { UIAbility, Want } from '@kit.AbilityKit'; +import { Want, common } from '@kit.AbilityKit'; import { BusinessError } from '@kit.BasicServicesKit'; const LOG_TAG = "InAppBrowserManager" @@ -41,17 +41,17 @@ export default class InAppBrowserManager extends ChannelDelegateImpl { public onMethodCall(call: MethodCall, result: MethodResult): void { switch (call.method) { case "open": - if (this.plugin != null && this.plugin.uiAbility != null) { - this.open(this.plugin.uiAbility, call.args as Map); + if (this.plugin != null && this.plugin.context != null) { + this.open(this.plugin.context, call.args as Map); result.success(true); } else { result.success(false); } break; case "openWithSystemBrowser": - if (this.plugin != null && this.plugin.uiAbility != null) { + if (this.plugin != null && this.plugin.context != null) { let url: string = call.argument("url") as string; - this.openWithSystemBrowser(this.plugin.uiAbility, url, result); + this.openWithSystemBrowser(this.plugin.context, url, result); } else { result.success(false); } @@ -61,20 +61,20 @@ export default class InAppBrowserManager extends ChannelDelegateImpl { } } - public open(uiAbility: UIAbility, args: Map) { + public open(context: common.UIAbilityContext, args: Map) { let want: Want = { - bundleName: uiAbility.context.abilityInfo.bundleName, + bundleName: context.abilityInfo.bundleName, abilityName: 'InAppBrowserAbility' }; - uiAbility.context.startAbility(want, (err: BusinessError) => { + context.startAbility(want, (err: BusinessError) => { if (err.code) { Log.e(LOG_TAG, `Failed to startAbility. Code: ${err.code}, message: ${err.message}`); } }); } - public openWithSystemBrowser(uiAbility: UIAbility, url: string, result: MethodResult): void { + public openWithSystemBrowser(context: common.UIAbilityContext, url: string, result: MethodResult): void { try { let want: Want = { action: 'ohos.want.action.viewData', @@ -82,7 +82,7 @@ export default class InAppBrowserManager extends ChannelDelegateImpl { uri: url } - uiAbility.context.startAbility(want, (err: BusinessError) => { + context.startAbility(want, (err: BusinessError) => { if (err.code) { Log.e(LOG_TAG, `Failed to startAbility. Code: ${err.code}, message: ${err.message}`); result.error(`Code: ${err.code}`, err.message, null);