From 0f64f195afeeb42388ededa1ffe139cf6b015b07 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 1 Jun 2021 14:45:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?resourcetable=E5=AF=BC=E5=8C=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build.gradle | 11 +++++++++++ .../securestoragetest/slice/MainAbilitySlice.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/entry/build.gradle b/entry/build.gradle index ac2809c..4746a9e 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,6 +1,17 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { + signingConfigs { + debug { + storeFile file('D:\\DESkeys\\HM_SecureStorage_key\\forPublicDebug.p12') + storePassword '0000001EFC4B7939A3F9D87EA096643094797C488D4B1310517625B9EEE8F0C3DC98C52EBFFCCC557A5799443A78' + keyAlias = 'admin' + keyPassword '0000001EBB83EFCF9B0113E9D5CC852326769F5751C9DA7174F190900E8536A847BF4134C41DE80B49EF5C3C8053' + signAlg = 'SHA256withECDSA' + profile file('D:\\DESkeys\\HM_SecureStorage_key\\SecureStorageDebug.p7b') + certpath file('D:\\DESkeys\\HM_SecureStorage_key\\forPublicDebugOnline.cer') + } + } compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 diff --git a/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java b/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java index b19da4f..342c096 100644 --- a/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java +++ b/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java @@ -18,7 +18,7 @@ package de.adorsys.ohos.securestoragetest.slice; import de.adorsys.ohos.securestoragelibrary.SecurePreferences; import de.adorsys.ohos.securestoragelibrary.SecureStorageException; -import com.de.adorsys.ohos.securestoragetest.ResourceTable; +import de.adorsys.ohos.securestoragetest.ResourceTable; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.colors.RgbColor; -- Gitee From a19010b817da31cf5c24f22fed2c7db22712e94c Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 1 Jun 2021 14:46:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?entry=E4=B8=8Bbuild.gradle=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build.gradle | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/entry/build.gradle b/entry/build.gradle index 4746a9e..ac2809c 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,17 +1,6 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - signingConfigs { - debug { - storeFile file('D:\\DESkeys\\HM_SecureStorage_key\\forPublicDebug.p12') - storePassword '0000001EFC4B7939A3F9D87EA096643094797C488D4B1310517625B9EEE8F0C3DC98C52EBFFCCC557A5799443A78' - keyAlias = 'admin' - keyPassword '0000001EBB83EFCF9B0113E9D5CC852326769F5751C9DA7174F190900E8536A847BF4134C41DE80B49EF5C3C8053' - signAlg = 'SHA256withECDSA' - profile file('D:\\DESkeys\\HM_SecureStorage_key\\SecureStorageDebug.p7b') - certpath file('D:\\DESkeys\\HM_SecureStorage_key\\forPublicDebugOnline.cer') - } - } compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 -- Gitee From 86a9db7cbc1dfb5de6c9d4e1a5d859a3bf2c58db Mon Sep 17 00:00:00 2001 From: wangpeng Date: Thu, 3 Jun 2021 14:57:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D:=201786=20=E3=80=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91=E3=80=90secure-storage-android?= =?UTF-8?q?=E3=80=91=E3=80=90Git=E7=89=88=E6=9C=AC=EF=BC=9A089d3a1e?= =?UTF-8?q?=E3=80=91key=E6=88=96value=E8=BE=83=E9=95=BF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=95=B4=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 06dd00d..d3c9f1f 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.7' + classpath 'com.huawei.ohos:hap:2.4.4.2' classpath 'com.huawei.ohos:decctest:1.0.0.7' } } diff --git a/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java b/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java index 342c096..efa857b 100644 --- a/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java +++ b/entry/src/main/java/de/adorsys/ohos/securestoragetest/slice/MainAbilitySlice.java @@ -178,6 +178,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL } // 展示成功信息 + storeTextTips.setMultipleLine(true); storeTextTips.setText("Value: " + storeValueText + " successfully saved for key: " + strokeKeyText); // 显示存储key value提示 @@ -203,6 +204,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL return; } String value = SecurePreferences.getStringValue(getApplicationContext(), getDataKeyText, FAILED); + getTextTips.setMultipleLine(true); getTextTips.setText("Decrypted Data for key: " + getDataKeyText + " = " + value); getTextTips.setVisibility(Text.VISIBLE); removeTextTips.setVisibility(Text.INVISIBLE); @@ -220,6 +222,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL } String value = SecurePreferences.getStringValue(getApplicationContext(), removeDataKeyText, FAILED); HiLog.info(LABEL, "removeValue " + value); + removeTextTips.setMultipleLine(true); if (FAILED.equals(value)) { removeTextTips.setText("Value for key: " + removeDataKey.getText() + " not exist !"); } else { -- Gitee