From ff52f30c00b7d92e3fa7d78e00f3c3900893fd5c Mon Sep 17 00:00:00 2001 From: yangbo Date: Thu, 20 Oct 2022 15:21:59 +0800 Subject: [PATCH] fixbug getPermission Signed-off-by: yangbo --- multimedia/medialibrary/common.js | 20 +++++++++++--- multimedia/userfilemgr/common.js | 45 ++++++++++++++++++++++++------- 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/multimedia/medialibrary/common.js b/multimedia/medialibrary/common.js index a90838a95..018591a09 100755 --- a/multimedia/medialibrary/common.js +++ b/multimedia/medialibrary/common.js @@ -206,13 +206,25 @@ const getPermission = async function (name) { let appInfo = await bundle.getApplicationInfo(name, 0, 100); let tokenID = appInfo.accessTokenId; let atManager = abilityAccessCtrl.createAtManager(); - let result1 = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.MEDIA_LOCATION", 1); - let result2 = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_MEDIA", 1); - let result3 = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_MEDIA", 1); + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.MEDIA_LOCATION", 1); + } catch (error) { + console.info('getPermission MEDIA_LOCATION failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_MEDIA", 1); + } catch (error) { + console.info('getPermission READ_MEDIA failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_MEDIA", 1); + } catch (error) { + console.info('getPermission WRITE_MEDIA failed') + } let isGranted1 = await atManager.verifyAccessToken(tokenID, "ohos.permission.MEDIA_LOCATION"); let isGranted2 = await atManager.verifyAccessToken(tokenID, "ohos.permission.READ_MEDIA"); let isGranted3 = await atManager.verifyAccessToken(tokenID, "ohos.permission.WRITE_MEDIA"); - if (!(result1 == 0 && result2 == 0 && result3 == 0) || !(isGranted1 == 0 && isGranted2 == 0 && isGranted3 == 0)) { + if (!(isGranted1 == 0 && isGranted2 == 0 && isGranted3 == 0)) { console.info('getPermission failed') } console.info('getPermission end') diff --git a/multimedia/userfilemgr/common.js b/multimedia/userfilemgr/common.js index 10d3ac2c2..6b56777a0 100755 --- a/multimedia/userfilemgr/common.js +++ b/multimedia/userfilemgr/common.js @@ -138,13 +138,41 @@ const getPermission = async function (name = 'ohos.acts.multimedia.userfilemgr') let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.userfilemgr', 0, 100); let tokenID = appInfo.accessTokenId; let atManager = abilityAccessCtrl.createAtManager(); - let result1 = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.MEDIA_LOCATION", 1); - let resultReadImageVideo = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_IMAGEVIDEO", 1); - let resultReadAudio = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_AUDIO", 1); - let resultReadDocument = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_DOCUMENT", 1); - let resultWriteImageVideo = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_IMAGEVIDEO", 1); - let resultWriteAudio = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_AUDIO", 1); - let resultWriteDocument = await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_DOCUMENT", 1); + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.MEDIA_LOCATION", 1); + } catch (error) { + console.info('getPermission MEDIA_LOCATION failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_IMAGEVIDEO", 1); + } catch (error) { + console.info('getPermission READ_IMAGEVIDEO failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_AUDIO", 1); + } catch (error) { + console.info('getPermission READ_AUDIO failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.READ_DOCUMENT", 1); + } catch (error) { + console.info('getPermission READ_DOCUMENT failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_IMAGEVIDEO", 1); + } catch (error) { + console.info('getPermission WRITE_IMAGEVIDEO failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_AUDIO", 1); + } catch (error) { + console.info('getPermission WRITE_AUDIO failed') + } + try { + await atManager.grantUserGrantedPermission(tokenID, "ohos.permission.WRITE_DOCUMENT", 1); + } catch (error) { + console.info('getPermission WRITE_DOCUMENT failed') + } let isGranted1 = await atManager.verifyAccessToken(tokenID, "ohos.permission.MEDIA_LOCATION"); let isGrantedReadImageVideo = await atManager.verifyAccessToken(tokenID, "ohos.permission.READ_IMAGEVIDEO"); let isGrantedReadAudio = await atManager.verifyAccessToken(tokenID, "ohos.permission.READ_AUDIO"); @@ -152,8 +180,7 @@ const getPermission = async function (name = 'ohos.acts.multimedia.userfilemgr') let isGrantedWriteImageVideo = await atManager.verifyAccessToken(tokenID, "ohos.permission.WRITE_IMAGEVIDEO"); let isGrantedWriteAudio = await atManager.verifyAccessToken(tokenID, "ohos.permission.WRITE_AUDIO"); let isGrantedWriteDocument = await atManager.verifyAccessToken(tokenID, "ohos.permission.WRITE_DOCUMENT"); - if (result1 != 0 || isGranted1 !=0 || !(resultReadImageVideo == 0 && resultReadAudio == 0 && resultReadDocument == 0) || - !(resultWriteImageVideo == 0 && resultWriteAudio == 0 && resultWriteDocument == 0) || + if (isGranted1 !=0 || !(isGrantedReadImageVideo == 0 && isGrantedReadAudio == 0 && isGrantedReadDocument == 0) || !(isGrantedWriteImageVideo == 0 && isGrantedWriteAudio == 0 && isGrantedWriteDocument == 0)) { console.info('getPermission failed') -- GitLab