From ec770a16f54cdfd28f6a0cbaf0b6af9ffb770c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rulong=20Chen=EF=BC=88=E9=99=88=E6=B1=9D=E9=BE=99=EF=BC=89?=
 <rulong.crl@alibaba-inc.com>
Date: Thu, 8 Aug 2024 11:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=8E=A5=E5=8F=A3=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitee.com/openharmony-sig/flutter_engine/pulls/374
---
 .../ets/dev/fluttercommunity/plus/share/Share.ets    | 12 +++---------
 .../plus/share/SharePlusOhosPlugin.ets               |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets
index e49e1eae..c1ec828a 100644
--- a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets
+++ b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets
@@ -15,7 +15,6 @@
 
 import Log from '@ohos/flutter_ohos/src/main/ets/util/Log';
 import common from '@ohos.app.ability.common';
-import UIAbility from '@ohos.app.ability.UIAbility';
 import List from '@ohos.util.List';
 import fs from '@ohos.file.fs';
 import { fileUri } from '@kit.CoreFileKit';
@@ -26,17 +25,12 @@ import uniformTypeDescriptor from '@ohos.data.uniformTypeDescriptor';
 const TAG = 'Share';
 
 export default class Share {
-  public context: common.Context | null = null;
-  public ability?: UIAbility | null = null;
+  public context?: common.UIAbilityContext | null = null;
 
-  constructor(context: common.Context, ability?: UIAbility) {
+  public setAbility(context: common.UIAbilityContext | null): void {
     this.context = context;
   }
 
-  public setAbility(ability: UIAbility | null): void {
-    this.ability = ability;
-  }
-
   public async share(text: string, subject: string | null, withResult: boolean, result: MethodResult): Promise<void> {
     Log.i(TAG, "share");
     let record: systemShare.SharedRecord = {
@@ -101,7 +95,7 @@ export default class Share {
           result.success('');
         });
       }
-      controller.show(this.ability?.context, {
+      controller.show(this.context, {
         previewMode: systemShare.SharePreviewMode.DETAIL,
         selectionMode: systemShare.SelectionMode.BATCH
       });
diff --git a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets
index 1d598fc4..ab869485 100644
--- a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets
+++ b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets
@@ -40,7 +40,7 @@ export default class SharePlusOhosPlugin implements FlutterPlugin, AbilityAware
 
   onAttachedToAbility(binding: AbilityPluginBinding) {
     Log.i(TAG, "onAttachedToAbility");
-    this.share?.setAbility(binding.getAbility());
+    this.share!.setAbility(binding.getAbilityContext());
   }
 
   onDetachedFromAbility() {
@@ -51,7 +51,7 @@ export default class SharePlusOhosPlugin implements FlutterPlugin, AbilityAware
   onAttachedToEngine(binding: FlutterPluginBinding): void {
     Log.i(TAG, "onAttachedToEngine");
     this.methodChannel = new MethodChannel(binding.getBinaryMessenger(), CHANNEL_NAME);
-    this.share = new Share(binding.getApplicationContext());
+    this.share = new Share();
     this.methodChannelHandlerImpl = new MethodChannelHandlerImpl(this.share);
     this.methodChannel.setMethodCallHandler(this.methodChannelHandlerImpl);
   }
-- 
Gitee