diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index 7cc40a64e81b38c2cf2c76802de32499c3cbc348..5940e211e71260e9a20061d80c4fa1e7e8683082 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 cc55938b2f324c1162887adc70436f86a35f5cfc..fdb1d01a5a5902242fce500399967a246d53f5ae 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) }) }