From 55b6914ea79ec1e2a33352da040540def3b2fe1f Mon Sep 17 00:00:00 2001 From: liushuling Date: Mon, 10 Oct 2022 15:52:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3d.ts=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liushuling Change-Id: I84d4bc7ee388e0ff1a8b7e27c2c0a3ad2e737329 --- .../main/ets/pages/application-tertiary.ets | 6 ++-- .../src/main/ets/pages/authority-tertiary.ets | 31 ++++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index 7cc40a6..5940e21 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -146,7 +146,7 @@ struct mediaDocumentItem { grantUserGrantedPermission(accessTokenId, permission) { abilityAccessCtrl.createAtManager().grantUserGrantedPermission( accessTokenId, permission, Constants.PERMISSION_FLAG).then((result) => { - nowGrantResult = result; + nowGrantResult = Constants.PERMISSION_INDEX; }) .catch((error) => { console.error(TAG + 'grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error)); @@ -161,7 +161,7 @@ struct mediaDocumentItem { revokeUserGrantedPermission(accessTokenId, permission) { abilityAccessCtrl.createAtManager().revokeUserGrantedPermission( accessTokenId, permission, Constants.PERMISSION_FLAG).then((result) => { - nowRevokeResult = result; + nowRevokeResult = Constants.PERMISSION_INDEX; }) .catch((error) => { console.error(TAG + 'revokeUserGrantedPermission failed. Cause: ' + JSON.stringify(error)); @@ -437,7 +437,7 @@ struct mediaDocumentItem { var acManager = abilityAccessCtrl.createAtManager() if (isOn) { acManager.grantUserGrantedPermission(bundleInfo.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION, Constants.PERMISSION_FLAG) - .then((res) => { res == abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED ? this.accurateIsOn = true : '' }) + .then((res) => { this.accurateIsOn = true }) } else { acManager.revokeUserGrantedPermission(bundleInfo.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION, Constants.PERMISSION_FLAG) .then(() => { this.accurateIsOn = false }) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index cc55938..fdb1d01 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -184,15 +184,7 @@ struct applicationItem { abilityAccessCtrl.createAtManager().grantUserGrantedPermission( accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => { // result: 0 Authorization succeeded; result: -1 Authorization failed - if (result !== Constants.PERMISSION_INDEX) { - this.authorizeDialogController.open(); - this.toggleIsOn[index] = false; - setTimeout(()=> { - this.authorizeDialogController.close(); - }, Constants.DELAY_TIME) - } else { - this.toggleIsOn[index] = true; - } + this.toggleIsOn[index] = true; let num = Constants.PERMISSION_NUM; for(let key in this.toggleIsOn){ if(this.toggleIsOn[key]){ @@ -201,6 +193,11 @@ struct applicationItem { } this.permissionNum = num; }).catch(error => { + this.authorizeDialogController.open(); + this.toggleIsOn[index] = false; + setTimeout(()=> { + this.authorizeDialogController.close(); + }, Constants.DELAY_TIME) console.error(TAG + 'abilityAccessCtrl.createAtManager.grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error)); }) } @@ -215,15 +212,7 @@ struct applicationItem { abilityAccessCtrl.createAtManager().revokeUserGrantedPermission( accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => { // result: 0 successfully cancel the authorization; result: -1 cancel the authorization failed - if (result !== Constants.PERMISSION_INDEX) { - this.authorizeDialogController.open(); - this.toggleIsOn[index] = true; - setTimeout(()=> { - this.authorizeDialogController.close(); - }, Constants.DELAY_TIME) - } else { - this.toggleIsOn[index] = false; - } + this.toggleIsOn[index] = false; let num = Constants.PERMISSION_NUM; for(let key in this.toggleIsOn){ if(this.toggleIsOn[key]){ @@ -231,6 +220,12 @@ struct applicationItem { } } this.permissionNum = num; + }).catch(error => { + this.authorizeDialogController.open(); + this.toggleIsOn[index] = true; + setTimeout(()=> { + this.authorizeDialogController.close(); + }, Constants.DELAY_TIME) }) } -- Gitee From cdd636e653097c3c6e12bf3cb08682852922ae1c Mon Sep 17 00:00:00 2001 From: liushuling Date: Mon, 10 Oct 2022 21:15:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3d.ts=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liushuling Change-Id: I705597c81e3f274d085077d8c310021967edc159 --- .../src/main/ets/pages/authority-management.ets | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index 5acb563..c61d1d2 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -301,9 +301,14 @@ struct authorityManagementPage { if (reqPermissionsLen > 0) { for (let j = 0; j < info.reqPermissions.length; j++) { var permission = info.reqPermissions[j]; - var flag = await acManager.getPermissionFlags(info.appInfo.accessTokenId, permission) - if(flag == Constants.PRE_AUTHORIZATION_NOT_MODIFIED) { - continue + try { + var flag = await acManager.getPermissionFlags(info.appInfo.accessTokenId, permission) + if(flag == Constants.PRE_AUTHORIZATION_NOT_MODIFIED) { + continue + } + } + catch(err) { + console.log(TAG + 'getPermissionFlags error: ' +JSON.stringify(err)) } if (userGrantPermissions.indexOf(permission) != -1) { reqUserPermissions.push(permission); -- Gitee