Skip to content

Commit 9d92bcb

Browse files
SundoggyNewSundoggyNew
committed
【ID869532311】App数据隐私合规检测风险问题修复-修改大陆中文隐私政策、双清单的链接为灵犀生成的链接。
http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192869532311 Change-Id: I22465d75931b0b6ff360daef6434d30b78661457
1 parent d633df1 commit 9d92bcb

File tree

8 files changed

+40
-207
lines changed

8 files changed

+40
-207
lines changed

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/TipShareDevDialog.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ private class TextClick extends ClickableSpan {
8888
public void onClick(View widget) {
8989
Intent intent = new Intent(getContext(), WebActivity.class);
9090
intent.putExtra(CommonField.EXTRA_TITLE, getContext().getString(R.string.register_agree_4));
91-
String url = CommonField.POLICY_PREFIX;
92-
url += "?uin=" + ANDROID_ID;
93-
url += CommonField.PRIVACY_POLICY_SUFFIX;
91+
String url = CommonField.PRIVACY_POLICY_URL_CN_ZH;
9492
intent.putExtra(CommonField.EXTRA_TEXT, url);
9593
getContext().startActivity(intent);
9694
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ class AboutUsActivity : BaseActivity() {
101101
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
102102
val intent = Intent(this@AboutUsActivity, WebActivity::class.java)
103103
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.register_agree_4))
104-
var url = CommonField.POLICY_PREFIX
105-
url += "?uin=$ANDROID_ID"
106-
url += CommonField.PRIVACY_POLICY_SUFFIX
104+
var url = CommonField.PRIVACY_POLICY_URL_CN_ZH
107105
intent.putExtra(CommonField.EXTRA_TEXT, url)
108106
startActivity(intent)
109107
} else {
@@ -121,23 +119,27 @@ class AboutUsActivity : BaseActivity() {
121119
}
122120

123121
tv_title_third_party_information -> {
124-
var url = ""
125122
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
126-
url = CommonField.THIRD_SDK_URL_US_ZH
123+
val intent = Intent(this@AboutUsActivity, WebActivity::class.java)
124+
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.rule_content_list))
125+
var url = CommonField.THIRD_SDK_URL_US_ZH
126+
intent.putExtra(CommonField.EXTRA_TEXT, url)
127+
startActivity(intent)
127128
} else {
128-
url = CommonField.THIRD_SDK_URL_US_EN
129+
OpensourceLicenseActivity.startWebWithExtra(this@AboutUsActivity, getString(R.string.rule_content_list), CommonField.THIRD_SDK_URL_US_EN)
129130
}
130-
OpensourceLicenseActivity.startWebWithExtra(this@AboutUsActivity, getString(R.string.rule_content_list), url)
131131
}
132132

133133
tv_title_collected_personal_information -> {
134-
var url = ""
135134
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
136-
url = CommonField.PERSONAL_INFO_URL_US_ZH
135+
val intent = Intent(this@AboutUsActivity, WebActivity::class.java)
136+
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.personal_information_list))
137+
var url = CommonField.PERSONAL_INFO_URL_US_ZH
138+
intent.putExtra(CommonField.EXTRA_TEXT, url)
139+
startActivity(intent)
137140
} else {
138-
url = CommonField.PERSONAL_INFO_URL_US_EN
141+
OpensourceLicenseActivity.startWebWithExtra(this@AboutUsActivity, getString(R.string.personal_information_list), CommonField.PERSONAL_INFO_URL_US_EN)
139142
}
140-
OpensourceLicenseActivity.startWebWithExtra(this@AboutUsActivity, getString(R.string.personal_information_list), url)
141143
}
142144

143145
tv_title_opensource -> {

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

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class ForgotPasswordActivity : PActivity(), ForgotPasswordView, View.OnClickList
6363
}
6464
}
6565
iv_register_agreement.visibility = View.INVISIBLE
66-
// formatTipText()
6766
}
6867

6968
private fun initViewPager() {
@@ -90,84 +89,6 @@ class ForgotPasswordActivity : PActivity(), ForgotPasswordView, View.OnClickList
9089
emailView.tv_forgot_to_phone.setOnClickListener(this)
9190
}
9291

93-
private fun formatTipText() {
94-
val str = resources.getString(R.string.register_agree_1)
95-
val partStr1 = resources.getString(R.string.register_agree_2)
96-
val partStr2 = resources.getString(R.string.register_agree_3)
97-
val partStr3 = resources.getString(R.string.register_agree_4)
98-
var showStr = str + partStr1 + partStr2 + partStr3
99-
val spannable = SpannableStringBuilder(showStr)
100-
spannable.setSpan(object : ClickableSpan() {
101-
override fun onClick(widget: View) {
102-
if (presenter.getCountryCode() == "86") {
103-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
104-
val intent = Intent(this@ForgotPasswordActivity, WebActivity::class.java)
105-
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.register_agree_2))
106-
var url = CommonField.POLICY_PREFIX
107-
url += "?uin=$ANDROID_ID"
108-
url += CommonField.SERVICE_POLICY_SUFFIX
109-
intent.putExtra(CommonField.EXTRA_TEXT, url)
110-
startActivity(intent)
111-
} else {
112-
OpensourceLicenseActivity.startWebWithExtra(this@ForgotPasswordActivity, getString(R.string.register_agree_2), CommonField.SERVICE_AGREEMENT_URL_CN_EN)
113-
}
114-
} else {
115-
var url = ""
116-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
117-
url = CommonField.SERVICE_AGREEMENT_URL_US_ZH
118-
} else {
119-
url = CommonField.SERVICE_AGREEMENT_URL_US_EN
120-
}
121-
OpensourceLicenseActivity.startWebWithExtra(this@ForgotPasswordActivity, getString(R.string.register_agree_2), url)
122-
}
123-
}
124-
125-
override fun updateDrawState(ds: TextPaint) {
126-
super.updateDrawState(ds)
127-
ds.color = resources.getColor(R.color.blue_0066FF)
128-
ds.setUnderlineText(false);
129-
}
130-
},
131-
str.length, str.length + partStr1.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
132-
133-
spannable.setSpan(object : ClickableSpan() {
134-
override fun onClick(widget: View) {
135-
if (presenter.getCountryCode() == "86") {
136-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
137-
val intent = Intent(this@ForgotPasswordActivity, WebActivity::class.java)
138-
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.register_agree_4))
139-
var url = CommonField.POLICY_PREFIX
140-
url += "?uin=$ANDROID_ID"
141-
url += CommonField.PRIVACY_POLICY_SUFFIX
142-
intent.putExtra(CommonField.EXTRA_TEXT, url)
143-
startActivity(intent)
144-
} else {
145-
OpensourceLicenseActivity.startWebWithExtra(this@ForgotPasswordActivity, getString(R.string.register_agree_4), CommonField.PRIVACY_POLICY_URL_CN_EN)
146-
}
147-
} else {
148-
var url = ""
149-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
150-
url = CommonField.PRIVACY_POLICY_URL_US_ZH
151-
} else {
152-
url = CommonField.PRIVACY_POLICY_URL_US_EN
153-
}
154-
OpensourceLicenseActivity.startWebWithExtra(this@ForgotPasswordActivity, getString(R.string.register_agree_4), url)
155-
}
156-
}
157-
158-
override fun updateDrawState(ds: TextPaint) {
159-
super.updateDrawState(ds)
160-
ds.color = resources.getColor(R.color.blue_0066FF)
161-
ds.setUnderlineText(false);
162-
}
163-
164-
},
165-
showStr.length - partStr1.length, showStr.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
166-
167-
tv_register_tip_click.setMovementMethod(LinkMovementMethod.getInstance())
168-
tv_register_tip_click.setText(spannable)
169-
}
170-
17192
override fun onClick(v: View?) {
17293
when (v) {
17394
phoneView.tv_forgot_to_country, phoneView.iv_forgot_to_country -> {

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

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,7 @@ class LoginActivity : PActivity(), LoginView, View.OnClickListener, WeChatLogin
125125
val partStr1 = resources.getString(R.string.register_agree_2)
126126
val partStr2 = resources.getString(R.string.register_agree_3)
127127
val partStr3 = resources.getString(R.string.register_agree_4)
128-
val partStr4 = ","
129-
val partStr5 = resources.getString(R.string.rule_content_list)
130-
val partStr6 = resources.getString(R.string.personal_information_list)
131-
var showStr = str + partStr1 + partStr4 + partStr3 + partStr4 + partStr5 + partStr2 + partStr6
128+
var showStr = str + partStr1 + partStr2 + partStr3
132129
val spannable = SpannableStringBuilder(showStr)
133130
spannable.setSpan(object : ClickableSpan() {
134131
override fun onClick(widget: View) {
@@ -169,9 +166,7 @@ class LoginActivity : PActivity(), LoginView, View.OnClickListener, WeChatLogin
169166
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
170167
val intent = Intent(this@LoginActivity, WebActivity::class.java)
171168
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.register_agree_4))
172-
var url = CommonField.POLICY_PREFIX
173-
url += "?uin=$ANDROID_ID"
174-
url += CommonField.PRIVACY_POLICY_SUFFIX
169+
var url = CommonField.PRIVACY_POLICY_URL_CN_ZH
175170
intent.putExtra(CommonField.EXTRA_TEXT, url)
176171
startActivity(intent)
177172
} else {
@@ -198,49 +193,6 @@ class LoginActivity : PActivity(), LoginView, View.OnClickListener, WeChatLogin
198193
},
199194
str.length + partStr1.length + partStr2.length, str.length + partStr1.length + partStr2.length + partStr3.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
200195

201-
spannable.setSpan(object : ClickableSpan() {
202-
override fun onClick(widget: View) {
203-
var url = ""
204-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
205-
url = CommonField.THIRD_SDK_URL_US_ZH
206-
} else {
207-
url = CommonField.THIRD_SDK_URL_US_EN
208-
}
209-
OpensourceLicenseActivity.startWebWithExtra(this@LoginActivity, getString(R.string.rule_content_list), url)
210-
211-
}
212-
213-
override fun updateDrawState(ds: TextPaint) {
214-
super.updateDrawState(ds)
215-
ds.color = resources.getColor(R.color.blue_0066FF)
216-
ds.setUnderlineText(false);
217-
}
218-
219-
},
220-
showStr.length - partStr6.length - partStr2.length - partStr5.length, showStr.length - partStr6.length - partStr2.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
221-
222-
spannable.setSpan(object : ClickableSpan() {
223-
override fun onClick(widget: View) {
224-
225-
var url = ""
226-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
227-
url = CommonField.PERSONAL_INFO_URL_US_ZH
228-
} else {
229-
url = CommonField.PERSONAL_INFO_URL_US_EN
230-
}
231-
OpensourceLicenseActivity.startWebWithExtra(this@LoginActivity, getString(R.string.personal_information_list), url)
232-
233-
}
234-
235-
override fun updateDrawState(ds: TextPaint) {
236-
super.updateDrawState(ds)
237-
ds.color = resources.getColor(R.color.blue_0066FF)
238-
ds.setUnderlineText(false);
239-
}
240-
241-
},
242-
showStr.length - partStr6.length, showStr.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
243-
244196
tv_login_tip.setMovementMethod(LinkMovementMethod.getInstance())
245197
tv_login_tip.setText(spannable)
246198
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ class PrivicyDialogActivity : BaseActivity() {
5555
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
5656
val intent = Intent(this@PrivicyDialogActivity, WebActivity::class.java)
5757
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.register_agree_4))
58-
var url = CommonField.POLICY_PREFIX
59-
url += "?uin=$ANDROID_ID"
60-
url += CommonField.PRIVACY_POLICY_SUFFIX
58+
var url = CommonField.PRIVACY_POLICY_URL_CN_ZH
6159
intent.putExtra(CommonField.EXTRA_TEXT, url)
6260
startActivity(intent)
6361
} else {
@@ -66,23 +64,27 @@ class PrivicyDialogActivity : BaseActivity() {
6664
}
6765

6866
override fun onOkClickedPersonalInfoList() {
69-
var url = ""
7067
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
71-
url = CommonField.PERSONAL_INFO_URL_US_ZH
68+
val intent = Intent(this@PrivicyDialogActivity, WebActivity::class.java)
69+
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.personal_information_list))
70+
var url = CommonField.PERSONAL_INFO_URL_US_ZH
71+
intent.putExtra(CommonField.EXTRA_TEXT, url)
72+
startActivity(intent)
7273
} else {
73-
url = CommonField.PERSONAL_INFO_URL_US_EN
74+
OpensourceLicenseActivity.startWebWithExtra(this@PrivicyDialogActivity, getString(R.string.personal_information_list), CommonField.PERSONAL_INFO_URL_US_EN)
7475
}
75-
OpensourceLicenseActivity.startWebWithExtra(this@PrivicyDialogActivity, getString(R.string.personal_information_list), url)
7676
}
7777

7878
override fun onOkClickedThirdSDKList() {
79-
var url = ""
8079
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
81-
url = CommonField.THIRD_SDK_URL_US_ZH
80+
val intent = Intent(this@PrivicyDialogActivity, WebActivity::class.java)
81+
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.rule_content_list))
82+
var url = CommonField.THIRD_SDK_URL_US_ZH
83+
intent.putExtra(CommonField.EXTRA_TEXT, url)
84+
startActivity(intent)
8285
} else {
83-
url = CommonField.THIRD_SDK_URL_US_EN
86+
OpensourceLicenseActivity.startWebWithExtra(this@PrivicyDialogActivity, getString(R.string.rule_content_list), CommonField.THIRD_SDK_URL_US_EN)
8487
}
85-
OpensourceLicenseActivity.startWebWithExtra(this@PrivicyDialogActivity, getString(R.string.rule_content_list), url)
8688
}
8789
})
8890
}

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

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,7 @@ class RegisterActivity : PActivity(), RegisterView, View.OnClickListener {
116116
val partStr1 = resources.getString(R.string.register_agree_2)
117117
val partStr2 = resources.getString(R.string.register_agree_3)
118118
val partStr3 = resources.getString(R.string.register_agree_4)
119-
val partStr4 = ","
120-
val partStr5 = resources.getString(R.string.rule_content_list)
121-
val partStr6 = resources.getString(R.string.personal_information_list)
122-
var showStr = str + partStr1 + partStr4 + partStr3 + partStr4 + partStr5 + partStr2 + partStr6
119+
var showStr = str + partStr1 + partStr2 + partStr3
123120
val spannable = SpannableStringBuilder(showStr)
124121
spannable.setSpan(object : ClickableSpan() {
125122
override fun onClick(widget: View) {
@@ -160,9 +157,7 @@ class RegisterActivity : PActivity(), RegisterView, View.OnClickListener {
160157
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
161158
val intent = Intent(this@RegisterActivity, WebActivity::class.java)
162159
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.register_agree_4))
163-
var url = CommonField.POLICY_PREFIX
164-
url += "?uin=$ANDROID_ID"
165-
url += CommonField.PRIVACY_POLICY_SUFFIX
160+
var url = CommonField.PRIVACY_POLICY_URL_CN_ZH
166161
intent.putExtra(CommonField.EXTRA_TEXT, url)
167162
startActivity(intent)
168163
} else {
@@ -189,49 +184,6 @@ class RegisterActivity : PActivity(), RegisterView, View.OnClickListener {
189184
},
190185
str.length + partStr1.length + partStr2.length, str.length + partStr1.length + partStr2.length + partStr3.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
191186

192-
spannable.setSpan(object : ClickableSpan() {
193-
override fun onClick(widget: View) {
194-
var url = ""
195-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
196-
url = CommonField.THIRD_SDK_URL_US_ZH
197-
} else {
198-
url = CommonField.THIRD_SDK_URL_US_EN
199-
}
200-
OpensourceLicenseActivity.startWebWithExtra(this@RegisterActivity, getString(R.string.rule_content_list), url)
201-
202-
}
203-
204-
override fun updateDrawState(ds: TextPaint) {
205-
super.updateDrawState(ds)
206-
ds.color = resources.getColor(R.color.blue_0066FF)
207-
ds.setUnderlineText(false);
208-
}
209-
210-
},
211-
showStr.length - partStr6.length - partStr2.length - partStr5.length, showStr.length - partStr6.length - partStr2.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
212-
213-
spannable.setSpan(object : ClickableSpan() {
214-
override fun onClick(widget: View) {
215-
216-
var url = ""
217-
if (Utils.getLang().contains(CommonField.ZH_TAG)) {
218-
url = CommonField.PERSONAL_INFO_URL_US_ZH
219-
} else {
220-
url = CommonField.PERSONAL_INFO_URL_US_EN
221-
}
222-
OpensourceLicenseActivity.startWebWithExtra(this@RegisterActivity, getString(R.string.personal_information_list), url)
223-
224-
}
225-
226-
override fun updateDrawState(ds: TextPaint) {
227-
super.updateDrawState(ds)
228-
ds.color = resources.getColor(R.color.blue_0066FF)
229-
ds.setUnderlineText(false);
230-
}
231-
232-
},
233-
showStr.length - partStr6.length, showStr.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
234-
235187
tv_register_tip.setMovementMethod(LinkMovementMethod.getInstance())
236188
tv_register_tip.setText(spannable)
237189
}

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

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

3+
import android.content.Intent
34
import android.view.View
45
import android.view.ViewGroup
56
import android.webkit.*
@@ -53,7 +54,11 @@ class WebActivity : BaseActivity() {
5354
val mWebViewClient = object : WebViewClient(){
5455
override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
5556
if (request?.url.toString().contains(THIRD_SDK_URL_US_ZH)) {
56-
OpensourceLicenseActivity.startWebWithExtra(this@WebActivity, getString(R.string.rule_content_list), THIRD_SDK_URL_US_ZH)
57+
val intent = Intent(this@WebActivity, WebActivity::class.java)
58+
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.rule_content_list))
59+
var url = THIRD_SDK_URL_US_ZH
60+
intent.putExtra(CommonField.EXTRA_TEXT, url)
61+
startActivity(intent)
5762
return true
5863
} else if (request?.url.toString().contains(THIRD_SDK_URL_US_EN)) {
5964
OpensourceLicenseActivity.startWebWithExtra(this@WebActivity, getString(R.string.rule_content_list), THIRD_SDK_URL_US_EN)

0 commit comments

Comments
 (0)