Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
8d7103f5
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8d7103f5
编写于
9月 16, 2020
作者:
H
Hamdi Kahloun
提交者:
GitHub
9月 15, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix NPE in PlatformPlugin.getClipboardData() (#21189)
上级
d45ab71d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
2 deletion
+32
-2
shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
...rm/android/io/flutter/plugin/platform/PlatformPlugin.java
+3
-0
shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
...d/test/io/flutter/plugin/platform/PlatformPluginTest.java
+29
-2
未找到文件。
shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
浏览文件 @
8d7103f5
...
...
@@ -280,6 +280,9 @@ public class PlatformPlugin {
private
CharSequence
getClipboardData
(
PlatformChannel
.
ClipboardContentFormat
format
)
{
ClipboardManager
clipboard
=
(
ClipboardManager
)
activity
.
getSystemService
(
Context
.
CLIPBOARD_SERVICE
);
if
(!
clipboard
.
hasPrimaryClip
())
return
null
;
ClipData
clip
=
clipboard
.
getPrimaryClip
();
if
(
clip
==
null
)
return
null
;
...
...
shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
浏览文件 @
8d7103f5
package
io.flutter.plugin.platform
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertNull
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
android.app.Activity
;
import
android.content.ClipData
;
import
android.content.ClipboardManager
;
import
android.content.Context
;
import
android.view.View
;
import
android.view.Window
;
import
io.flutter.embedding.engine.systemchannels.PlatformChannel
;
import
io.flutter.embedding.engine.systemchannels.PlatformChannel.ClipboardContentFormat
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.robolectric.RobolectricTestRunner
;
...
...
@@ -38,6 +42,27 @@ public class PlatformPluginTest {
platformPlugin
.
vibrateHapticFeedback
(
PlatformChannel
.
HapticFeedbackType
.
SELECTION_CLICK
);
}
@Test
public
void
platformPlugin_getClipboardData
()
{
ClipboardManager
clipboardManager
=
RuntimeEnvironment
.
application
.
getSystemService
(
ClipboardManager
.
class
);
View
fakeDecorView
=
mock
(
View
.
class
);
Window
fakeWindow
=
mock
(
Window
.
class
);
when
(
fakeWindow
.
getDecorView
()).
thenReturn
(
fakeDecorView
);
Activity
fakeActivity
=
mock
(
Activity
.
class
);
when
(
fakeActivity
.
getWindow
()).
thenReturn
(
fakeWindow
);
when
(
fakeActivity
.
getSystemService
(
Context
.
CLIPBOARD_SERVICE
)).
thenReturn
(
clipboardManager
);
PlatformChannel
fakePlatformChannel
=
mock
(
PlatformChannel
.
class
);
PlatformPlugin
platformPlugin
=
new
PlatformPlugin
(
fakeActivity
,
fakePlatformChannel
);
ClipboardContentFormat
clipboardFormat
=
ClipboardContentFormat
.
PLAIN_TEXT
;
assertNull
(
platformPlugin
.
mPlatformMessageHandler
.
getClipboardData
(
clipboardFormat
));
ClipData
clip
=
ClipData
.
newPlainText
(
"label"
,
"Text"
);
clipboardManager
.
setPrimaryClip
(
clip
);
assertNotNull
(
platformPlugin
.
mPlatformMessageHandler
.
getClipboardData
(
clipboardFormat
));
}
@Test
public
void
platformPlugin_hasStrings
()
{
ClipboardManager
clipboardManager
=
...
...
@@ -52,10 +77,12 @@ public class PlatformPluginTest {
PlatformChannel
fakePlatformChannel
=
mock
(
PlatformChannel
.
class
);
PlatformPlugin
platformPlugin
=
new
PlatformPlugin
(
fakeActivity
,
fakePlatformChannel
);
clipboardManager
.
setText
(
"iamastring"
);
ClipData
clip
=
ClipData
.
newPlainText
(
"label"
,
"Text"
);
clipboardManager
.
setPrimaryClip
(
clip
);
assertTrue
(
platformPlugin
.
mPlatformMessageHandler
.
clipboardHasStrings
());
clipboardManager
.
setText
(
""
);
clip
=
ClipData
.
newPlainText
(
""
,
""
);
clipboardManager
.
setPrimaryClip
(
clip
);
assertFalse
(
platformPlugin
.
mPlatformMessageHandler
.
clipboardHasStrings
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录