Skip to content

Commit 13bad76

Browse files
SundoggyNewSundoggyNew
committed
修复合规-建议遵循最小必要原则，仅申请App业务功能所必需的权限，故去掉短信权限申请。
Change-Id: Ic68fdf5061e07bedf52e0fd2576b8fd3dc8ccbef
1 parent d1dca30 commit 13bad76

File tree

4 files changed

+3
-98
lines changed

4 files changed

+3
-98
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
99
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
1010
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
11-
<uses-permission android:name="android.permission.CAMERA" /> <!-- 读写短信的权限 -->
12-
<uses-permission android:name="android.permission.RECEIVE_SMS" />
13-
<uses-permission android:name="android.permission.READ_SMS" />
14-
<uses-permission android:name="android.permission.SEND_SMS" />
15-
<uses-permission android:name="android.permission.WRITE_SMS" /> <!-- 腾讯地图新增开始 -->
11+
<uses-permission android:name="android.permission.CAMERA" />
12+
<!-- 腾讯地图新增开始 -->
1613
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 通过GPS得到精确位置 -->
1714
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
1815
<!-- 通过网络得到粗略位置 -->

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/ControlPermissionActivity.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ class ControlPermissionActivity : BaseActivity() {
2727
Manifest.permission.CHANGE_WIFI_STATE,
2828
Manifest.permission.CHANGE_WIFI_MULTICAST_STATE,
2929
Manifest.permission.ACCESS_FINE_LOCATION,
30-
Manifest.permission.ACCESS_COARSE_LOCATION,
31-
Manifest.permission.RECEIVE_SMS,
32-
Manifest.permission.READ_SMS,
33-
Manifest.permission.SEND_SMS,
34-
Manifest.permission.WRITE_SETTINGS)
30+
Manifest.permission.ACCESS_COARSE_LOCATION)
3531

3632
private var permissionsData: MutableList<PermissionAccessInfo> = ArrayList()
3733
private var adapter: PermissionsAdapter? = null

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/GetCodeActivity.kt‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.tencent.iot.explorer.link.kitlink.activity
22

3-
import android.Manifest
4-
import android.content.Context
53
import android.content.Intent
64
import android.os.Handler
7-
import com.alibaba.fastjson.JSONObject
85
import com.tencent.iot.explorer.link.R
96
import com.tencent.iot.explorer.link.core.auth.util.Weak
107
import com.tencent.iot.explorer.link.kitlink.consts.CommonField
@@ -14,7 +11,6 @@ import com.tencent.iot.explorer.link.mvp.presenter.GetCodePresenter
1411
import com.tencent.iot.explorer.link.mvp.view.GetCodeView
1512
import com.tencent.iot.explorer.link.T
1613
import com.tencent.iot.explorer.link.core.utils.KeyBoardUtils
17-
import com.tencent.iot.explorer.link.customview.dialog.PermissionDialog
1814
import kotlinx.android.synthetic.main.activity_get_code.*
1915
import kotlinx.android.synthetic.main.menu_back_layout.*
2016

@@ -32,13 +28,6 @@ class GetCodeActivity : PActivity(), GetCodeView {
3228
const val COUNTRY_CODE = "country_code"
3329
}
3430

35-
private var permissionDialog: PermissionDialog? = null
36-
private val permissions = arrayOf(
37-
Manifest.permission.RECEIVE_SMS,
38-
Manifest.permission.READ_SMS,
39-
Manifest.permission.SEND_SMS
40-
)
41-
4231
private var handler by Weak<Handler>()
4332

4433
override fun getContentView(): Int {
@@ -50,26 +39,6 @@ class GetCodeActivity : PActivity(), GetCodeView {
5039
}
5140

5241
override fun initView() {
53-
if (!checkPermissions(permissions)) {
54-
// 查看请求sms权限的时间是否大于48小时
55-
var smsJsonString = Utils.getStringValueFromXml(T.getContext(), CommonField.PERMISSION_SMS, CommonField.PERMISSION_SMS)
56-
var smsJson: JSONObject? = JSONObject.parse(smsJsonString) as JSONObject?
57-
val lasttime = smsJson?.getLong(CommonField.PERMISSION_SMS)
58-
if (lasttime != null && lasttime > 0 && System.currentTimeMillis() / 1000 - lasttime < 48*60*60) {
59-
T.show(getString(R.string.permission_of_sms_refuse))
60-
return
61-
}
62-
permissionDialog = PermissionDialog(this@GetCodeActivity, R.mipmap.permission_sms, getString(R.string.permission_sms_lips), getString(R.string.permission_sms))
63-
permissionDialog!!.show()
64-
requestPermission(permissions)
65-
66-
// 记录请求sms权限的时间
67-
var json = JSONObject()
68-
json.put(CommonField.PERMISSION_SMS, System.currentTimeMillis() / 1000)
69-
Utils.setXmlStringValue(T.getContext(), CommonField.PERMISSION_SMS, CommonField.PERMISSION_SMS, json.toJSONString())
70-
} else {
71-
permissionAllGranted()
72-
}
7342
presenter = GetCodePresenter(this)
7443
tv_title.text = getString(R.string.verification_code)
7544
presenter.lockResend()
@@ -93,20 +62,6 @@ class GetCodeActivity : PActivity(), GetCodeView {
9362
}
9463
}
9564

96-
override fun onRequestPermissionsResult(
97-
requestCode: Int,
98-
permissions: Array<String>,
99-
grantResults: IntArray
100-
) {
101-
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
102-
if (requestCode == 102) {
103-
if (permissions.contains(Manifest.permission.READ_SMS)) {
104-
permissionDialog?.dismiss()
105-
permissionDialog = null
106-
}
107-
}
108-
}
109-
11065
/**
11166
* 获得intent中的数据
11267
*/

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/LoginActivity.kt‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.tencent.iot.explorer.link.kitlink.activity
22

3-
import android.Manifest
43
import android.content.Intent
54
import android.os.Handler
65
import android.text.*
@@ -28,7 +27,6 @@ import com.tencent.iot.explorer.link.core.auth.callback.MyCallback
2827
import com.tencent.iot.explorer.link.core.auth.entity.User
2928
import com.tencent.iot.explorer.link.core.auth.response.BaseResponse
3029
import com.tencent.iot.explorer.link.core.utils.KeyBoardUtils
31-
import com.tencent.iot.explorer.link.customview.dialog.PermissionDialog
3230
import kotlinx.android.synthetic.main.activity_login2.*
3331
import kotlinx.android.synthetic.main.layout_account_passwd_login.view.*
3432
import kotlinx.android.synthetic.main.layout_verify_code_login.view.*
@@ -48,13 +46,6 @@ class LoginActivity : PActivity(), LoginView, View.OnClickListener, WeChatLogin
4846
private var canGetCode = true
4947
private var handler: Handler = Handler()
5048

51-
private val permissions = arrayOf(
52-
Manifest.permission.RECEIVE_SMS,
53-
Manifest.permission.READ_SMS,
54-
Manifest.permission.SEND_SMS
55-
)
56-
57-
private var permissionDialog: PermissionDialog? = null
5849
private var agreement = false
5950
private val ANDROID_ID = App.uuid
6051

@@ -106,20 +97,6 @@ class LoginActivity : PActivity(), LoginView, View.OnClickListener, WeChatLogin
10697

10798
}
10899

109-
override fun onRequestPermissionsResult(
110-
requestCode: Int,
111-
permissions: Array<String>,
112-
grantResults: IntArray
113-
) {
114-
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
115-
if (requestCode == 102) {
116-
if (permissions.contains(Manifest.permission.READ_SMS)) {
117-
permissionDialog?.dismiss()
118-
permissionDialog = null
119-
}
120-
}
121-
}
122-
123100
private fun formatTipText() {
124101
val str = resources.getString(R.string.register_agree_1)
125102
val partStr1 = resources.getString(R.string.register_agree_2)
@@ -441,26 +418,6 @@ class LoginActivity : PActivity(), LoginView, View.OnClickListener, WeChatLogin
441418
val account = verifyCodeLoginView.et_login_phone_or_email_byverifycode.text.trim().toString()
442419
accountForAutoFill = account
443420
if (!account.contains("@")) {
444-
if (!checkPermissions(permissions)) {
445-
// 查看请求sms权限的时间是否大于48小时
446-
var smsJsonString = Utils.getStringValueFromXml(T.getContext(), CommonField.PERMISSION_SMS, CommonField.PERMISSION_SMS)
447-
var smsJson: JSONObject? = JSONObject.parse(smsJsonString) as JSONObject?
448-
val lasttime = smsJson?.getLong(CommonField.PERMISSION_SMS)
449-
if (lasttime != null && lasttime > 0 && System.currentTimeMillis() / 1000 - lasttime < 48*60*60) {
450-
T.show(getString(R.string.permission_of_sms_refuse))
451-
return
452-
}
453-
permissionDialog = PermissionDialog(this@LoginActivity, R.mipmap.permission_sms, getString(R.string.permission_sms_lips), getString(R.string.permission_sms))
454-
permissionDialog!!.show()
455-
requestPermission(permissions)
456-
457-
// 记录请求sms权限的时间
458-
var json = JSONObject()
459-
json.put(CommonField.PERMISSION_SMS, System.currentTimeMillis() / 1000)
460-
Utils.setXmlStringValue(T.getContext(), CommonField.PERMISSION_SMS, CommonField.PERMISSION_SMS, json.toJSONString())
461-
} else {
462-
permissionAllGranted()
463-
}
464421
accountType = true
465422
presenter.setPhone(account)
466423
presenter.requestPhoneCode()

0 commit comments

Comments
 (0)