CNLive Android Team / ExternalSharing · Commits

Commit 673276fade0b8accc9db5b10794ba114c4acdc42

Authored by 朱显松
1 parent bcffdad7

外部分享、地址参数签名增加域名限定

Inline Side-by-side
Showing 3 changed files with 20 additions and 17 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
  View file @673276f
... ... @@ -138,17 +138,20 @@ public class ShareIMActivity extends AppCompatActivity {
138 138 }
139 139  
140 140 public static String processUrlData(String shareInfoUrl) {
141   - Uri uri = Uri.parse(shareInfoUrl);
142   - String[] urls = shareInfoUrl.split("\\?");
143   - String url = urls[0];
144   - StringBuilder pageUrl = new StringBuilder(url);
145   - pageUrl.append("?");
146   - for (String key : uri.getQueryParameterNames()) {
147   - String value = UriUtil.getQueryParameterWithDecode(uri.getEncodedQuery(), key);
148   - pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(value) ? "" : value)).append("&");
  141 + if (shareInfoUrl == null) return "";
  142 + if (shareInfoUrl.contains("wjjh5test.cnlive.com") || shareInfoUrl.contains("wjjh5.cnlive.com")) {
  143 + Uri uri = Uri.parse(shareInfoUrl);
  144 + String[] urls = shareInfoUrl.split("\\?");
  145 + String url = urls[0];
  146 + StringBuilder pageUrl = new StringBuilder(url);
  147 + pageUrl.append("?");
  148 + for (String key : uri.getQueryParameterNames()) {
  149 + String value = UriUtil.getQueryParameterWithDecode(uri.getEncodedQuery(), key);
  150 + pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(value) ? "" : value)).append("&");
  151 + }
  152 + pageUrl = deleteCharOfEnd(pageUrl, "&", true);
  153 + shareInfoUrl = pageUrl.toString();
149 154 }
150   - pageUrl = deleteCharOfEnd(pageUrl, "&", true);
151   - shareInfoUrl = pageUrl.toString();
152 155 return shareInfoUrl;
153 156 }
154 157  
... ... @@ -223,14 +226,14 @@ public class ShareIMActivity extends AppCompatActivity {
223 226 startSelectForwardActivity(context, equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "", "", AppConfig.getShareLink(), processUrlData(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_LINK);
224 227 killTime();
225 228 }
226   - } else if ((equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + "").contains("http") && !Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http") && !(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)+"").contains("mp.weixin.qq.com")) {
  229 + } else if ((equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + "").contains("http") && !Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http") && !(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + "").contains("mp.weixin.qq.com")) {
227 230 int begin = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().indexOf("http");
228 231 int end = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().length();
229 232 if (begin > 0 && end > 0) {
230 233 startSelectForwardActivity(context, Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(0, begin), Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(0, begin), AppConfig.getShareLink(), processUrlData(Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(begin, end)), TYPE_SHARE_LINK);
231 234 killTime();
232 235 }
233   - } else if ((equals ? preferences.getString("extratext", "") : bundle.get(TEXT)+"").contains("http") && !Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http") && (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)+"").contains("mp.weixin.qq.com")) {
  236 + } else if ((equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + "").contains("http") && !Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http") && (equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + "").contains("mp.weixin.qq.com")) {
234 237 new Thread(new Runnable() {
235 238  
236 239 private String srcjsoup;
... ... @@ -273,7 +276,7 @@ public class ShareIMActivity extends AppCompatActivity {
273 276 }
274 277 }).start();
275 278 } else {
276   - startSelectForwardActivity(context, (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)) == null ? (equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT)+"") : (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)+""), TYPE_SHARE_TEXT, IN_TYPE_EXT_SHARE);
  279 + startSelectForwardActivity(context, (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)) == null ? (equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "") : (equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_TEXT, IN_TYPE_EXT_SHARE);
277 280 killTime();
278 281 }
279 282 } else {
... ... @@ -721,8 +724,8 @@ public class ShareIMActivity extends AppCompatActivity {
721 724 * @param shareType SelectForwardFragment.TYPE_SHARE_LINK
722 725 */
723 726 public static void startSelectForwardActivity(Context context, String shareTitle, String shareDesc, String shareImg, String shareLink, int shareType) {
724   - if(shareLink!=null && shareLink.contains("(") && shareLink.contains(")")) {
725   - shareLink = shareLink.substring(0, shareLink.indexOf("("));
  727 + if (shareLink != null && shareLink.contains("(") && shareLink.contains(")")) {
  728 + shareLink = shareLink.substring(0, shareLink.indexOf("("));
726 729 }
727 730 ARouter.getInstance().build("/cnconversation/SelectForwardActivity")
728 731 .withString("shareTitle", shareTitle)
... ...
build.gradle
  View file @673276f
... ... @@ -64,7 +64,7 @@ ext {
64 64 qmui = '1.1.5'
65 65  
66 66 libLargeImage = '1.0.4-androidx'
67   - libBase = '1.9.2.0-androidx'
  67 + libBase = '2.0.0'
68 68 libVideoQiniu = '1.0.7.2'
69 69  
70 70 //阿里路由框架
... ...
config.gradle
  View file @673276f
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.2.9",
  24 + version: "1.0.3",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.outside_share",
27 27 //Lib库名称
... ...