openharmony/security_privacy_center
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_privacy_center synced 2024-11-26 17:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

证书管理session冲突修复

Browse Source 
Signed-off-by: 杨海龙2023 <yanghailong26@huawei.com>
This commit is contained in:
杨海龙2023 2024-08-01 16:11:32 +08:00
parent 68901e3ce0
commit 3a42813f6f
8 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CertManager/src/main/ets/MainAbility/CertPickerUiExtAbility.ets
View File

@ -40,7 +40,6 @@ export default class CertPickerUiExtAbility extends UIExtensionAbility {
}
let storage: LocalStorage = new LocalStorage(param);
session.loadContent('pages/picker/CertManagerSheetFa', storage);
GlobalContext.getContext().setSession(session, true);
let pwdStore = new PwdStore();
GlobalContext.getContext().setPwdStore(pwdStore);
try {

2
CertManager/src/main/ets/MainAbility/MainExtensionAbility.ts
View File

@ -47,7 +47,7 @@ export default class MainExtensionAbility extends UIExtensionAbility {
session.loadContent('pages/certManagerFa', storage);
}
GlobalContext.getContext().setAbilityWant(want);
GlobalContext.getContext().setSession(session, false);
GlobalContext.getContext().setSession(session);
let pwdStore = new PwdStore();
GlobalContext.getContext().setPwdStore(pwdStore);
GlobalContext.getContext().setFlag(true);

18
CertManager/src/main/ets/common/GlobalContext.ts
View File

@ -44,8 +44,6 @@ export class GlobalContext {
private session: UIExtensionContentSession;
private flag: Boolean;
private sheetSession: UIExtensionContentSession;
public static getContext(): GlobalContext {
if (!GlobalContext.instance) {
GlobalContext.instance = new GlobalContext();
@ -65,12 +63,8 @@ export class GlobalContext {
return this.want;
}
getSession(isSheetPage: boolean): UIExtensionContentSession {
if (isSheetPage) {
return this.sheetSession;
} else {
return this.session;
}
getSession(): UIExtensionContentSession {
return this.session;
}
getFlag(): Boolean {
@ -89,12 +83,8 @@ export class GlobalContext {
this.want = want;
}
setSession(session: UIExtensionContentSession, isSheetPage: boolean): void {
if (isSheetPage) {
this.sheetSession = session;
} else {
this.session = session;
}
setSession(session: UIExtensionContentSession): void {
this.session = session;
}
setFlag(flag: Boolean): void {

2
CertManager/src/main/ets/common/component/headComponent.ets
View File

@ -50,7 +50,7 @@ export default struct HeadComponent {
let length = Router.getLength();
console.info(TAG + 'router length: ' + Number(length));
if (GlobalContext.getContext().getFlag()) {
Number(length) == 1 ? GlobalContext.getContext().getSession(this.isStartBySheet).sendData({'action': 'exit'}) : Router.back();
Number(length) == 1 ? GlobalContext.getContext().getSession().sendData({'action': 'exit'}) : Router.back();
} else {
Number(length) == 1 ? GlobalContext.getContext().getCmContext().terminateSelf() : Router.back();
}

3
CertManager/src/main/ets/model/PreventScreenshotsModel.ets
View File

@ -31,9 +31,8 @@ export default class PreventScreenshotsModel {
return PreventScreenshotsModel.sInstance;
}
PreventScreenshots(flag: boolean, isSheetPage: boolean) {
PreventScreenshots(flag: boolean, session: UIExtensionContentSession | undefined) {
let isPrivacyMode: boolean = flag;
let session: UIExtensionContentSession = GlobalContext.getContext().getSession(isSheetPage);
if (session !== undefined) {
session.setWindowPrivacyMode(isPrivacyMode);
return;

4
CertManager/src/main/ets/pages/certPwdInput.ets
View File

@ -35,7 +35,7 @@ struct CertPwdInput {
@State mPreventScreenshotsPresenter: PreventScreenshotsPresenter = PreventScreenshotsPresenter.getInstance();
onPageShow() {
this.mPreventScreenshotsPresenter.PreventScreenshots(true, false);
this.mPreventScreenshotsPresenter.PreventScreenshots(true, GlobalContext.getContext().getSession());
let uri = GlobalContext.getContext().getAbilityWant().uri;
GlobalContext.getContext().clearAbilityWantUri();
@ -51,7 +51,7 @@ struct CertPwdInput {
}
onPageHide() {
this.mPreventScreenshotsPresenter.PreventScreenshots(false, false);
this.mPreventScreenshotsPresenter.PreventScreenshots(false, GlobalContext.getContext().getSession());
}
build() {

4
CertManager/src/main/ets/pages/picker/CertManagerSheetFa.ets
View File

@ -82,7 +82,9 @@ export struct CertManagerSheetFa {
} else if (name === NavEntryKey.AUTHORIZED_APP_ENTRY) {
AuthorizedAppManagementPage()
} else if (name === NavEntryKey.CRED_PWD_INPUT_ENTRY) {
CredPwdInputPage()
CredPwdInputPage({
sheetSession: this.session
})
}
}

7
CertManager/src/main/ets/pages/picker/CredPwdInputPage.ets
View File

@ -22,6 +22,7 @@ import { GlobalContext } from '../../common/GlobalContext';
import CmInstallPresenter from '../../presenter/CmInstallPresenter';
import PreventScreenshotsPresenter from '../../model/PreventScreenshotsModel';
import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession';
const TAG: string = 'CredPwdInputPage: ';
@ -47,12 +48,14 @@ export struct CredPwdInputPage {
@State mPreventScreenshotsPresenter: PreventScreenshotsPresenter = PreventScreenshotsPresenter.getInstance();
private sheetSession?: UIExtensionContentSession;
onPageShow(): void {
this.mPreventScreenshotsPresenter.PreventScreenshots(true, true);
this.mPreventScreenshotsPresenter.PreventScreenshots(true, this.sheetSession);
}
onPageHide(): void {
this.mPreventScreenshotsPresenter.PreventScreenshots(false, true);
this.mPreventScreenshotsPresenter.PreventScreenshots(false, this.sheetSession);
}
build() {