Skip to content

Commit 002976d

Browse files
committed
Fix a request rejection error in the favorite topics and follow interfaces
Fix a request rejection error in the favorite topics and follow interfaces
1 parent bc23582 commit 002976d

File tree

6 files changed

+45
-8
lines changed

6 files changed

+45
-8
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
22
//apply plugin: "com.flurry.android.symbols"
33

44
android {
5-
compileSdkVersion 30
5+
compileSdkVersion 33
66
defaultConfig {
77
applicationId "me.ghui.v2er"
88
minSdkVersion 27
9-
targetSdkVersion 30
9+
targetSdkVersion 33
1010
versionCode rootProject.ext.app.versionCode
1111
versionName rootProject.ext.app.versionName
1212
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="me.ghui.v2er">
45

56
<uses-permission android:name="android.permission.INTERNET" />
67
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7-
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
8+
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
9+
tools:ignore="QueryAllPackagesPermission" />
810

911
<application
1012
android:name=".general.App"
@@ -28,7 +30,8 @@
2830

2931
<activity
3032
android:name=".module.general.RouteActivity"
31-
android:theme="@style/SplashTheme">
33+
android:theme="@style/SplashTheme"
34+
android:exported="true">
3235
<intent-filter>
3336
<action android:name="android.intent.action.MAIN" />
3437
<category android:name="android.intent.category.LAUNCHER" />

app/src/main/assets/v2ex.com.cer

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIFCjCCBLGgAwIBAgIQDDQDGM1v+PJ15gZd51KyYzAKBggqhkjOPQQDAjBKMQsw
3+
CQYDVQQGEwJVUzEZMBcGA1UEChMQQ2xvdWRmbGFyZSwgSW5jLjEgMB4GA1UEAxMX
4+
Q2xvdWRmbGFyZSBJbmMgRUNDIENBLTMwHhcNMjIwNTAxMDAwMDAwWhcNMjMwNTAx
5+
MjM1OTU5WjBoMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQG
6+
A1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRmbGFyZSwgSW5jLjER
7+
MA8GA1UEAxMIdjJleC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQa3Xed
8+
Yo0WA1IiCBkOo7jsJFV/iyI34W+WbQ72CqT54tGbN4Dh75Cb3XZVlPF6CVwPOfhN
9+
Guf1DNLe8pMWT5sco4IDWTCCA1UwHwYDVR0jBBgwFoAUpc436uuwdQ6UZ4i0RfrZ
10+
JBCHlh8wHQYDVR0OBBYEFDDEWpUY1uZB2VTEKMdyTWbWOXOXMB8GA1UdEQQYMBaC
11+
CioudjJleC5jb22CCHYyZXguY29tMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAU
12+
BggrBgEFBQcDAQYIKwYBBQUHAwIwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Ny
13+
bDMuZGlnaWNlcnQuY29tL0Nsb3VkZmxhcmVJbmNFQ0NDQS0zLmNybDA3oDWgM4Yx
14+
aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0Nsb3VkZmxhcmVJbmNFQ0NDQS0zLmNy
15+
bDA+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3
16+
LmRpZ2ljZXJ0LmNvbS9DUFMwdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhho
17+
dHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jYWNl
18+
cnRzLmRpZ2ljZXJ0LmNvbS9DbG91ZGZsYXJlSW5jRUNDQ0EtMy5jcnQwDAYDVR0T
19+
AQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHYArfe++nz/EMiLnT2c
20+
Hj4YarRnKV3PsQwkyoWGNOvcgooAAAGAfVYWOQAABAMARzBFAiEAr8T/GHTEZ5ST
21+
FAd9K5krr4KkwBLRmrVJgTxJrodC1PUCIHYVe+eHWr12bt+FYd6ei3pIpJLIg9oX
22+
/HyWznIKy1l3AHYANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAGA
23+
fVYWIAAABAMARzBFAiEAu4gv2QeBcejY2pm7uupdyFNDSA+vksdk2WK6FEXcBtkC
24+
IFPdKOugZw3f4dO5wvz2iFqDz/CJ862G/6hPFGaYPbm3AHYAs3N3B+GEUPhjhtYF
25+
qdwRCUp5LbFnDAuH3PADDnk2pZoAAAGAfVYWUgAABAMARzBFAiB0fFp55Dbc4sA3
26+
LYC0zO6rhlI8q1aFF3p8VDdeeBXCAAIhAI6+C33azX4d+rg18TTMCBIF+bXtiztx
27+
fjO5Lp/uPso0MAoGCCqGSM49BAMCA0cAMEQCIApn7EQolzU9Qeexj0S/XWw7UB5n
28+
C/iL4PezrNnbjmqfAiB6sodlkyGMV8kUtuv9aRVkhSFkge630DbVm1Dhfb2aqg==
29+
-----END CERTIFICATE-----

app/src/main/java/me/ghui/v2er/module/login/SignInWithGoogleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void open(Context context, String once) {
4040
@Override
4141
protected void configWebView(WebSettings settings) {
4242
super.configWebView(settings);
43-
settings.setUserAgentString(APIService.WAP_USER_AGENT);
43+
settings.setUserAgentString(APIService.WAP_Android_USER_AGENT);
4444
settings.setJavaScriptEnabled(true);
4545
settings.setDomStorageEnabled(true);
4646
settings.setDatabaseEnabled(true);
@@ -63,7 +63,7 @@ public void onBackPressed() {
6363
protected boolean checkIntercept(String currentUrl) {
6464
L.d("url: " + currentUrl);
6565
if (currentUrl.startsWith(Constants.BASE_URL + "/mission/daily")) {
66-
mWebView.getSettings().setUserAgentString(APIService.WAP_USER_AGENT);
66+
mWebView.getSettings().setUserAgentString(APIService.WAP_Android_USER_AGENT);
6767
doGetUserInfo();
6868
return true;
6969
}

app/src/main/java/me/ghui/v2er/network/APIService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
*/
4242

4343
public class APIService {
44-
public static final String WAP_USER_AGENT = "Mozilla/5.0 (Linux; Android 9.0; V2er Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36";
44+
45+
public static final String WAP_Android_USER_AGENT = "Mozilla/5.0 (Linux; Android 9.0; V2er Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36";
46+
47+
public static final String WAP_IOS_USER_AGENT = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1";
4548
public static final String WEB_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4; V2er) " +
4649
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36";
4750
public static final String UA_KEY = "user-agent";
@@ -120,7 +123,7 @@ public Response intercept(Chain chain) throws IOException {
120123
String ua = request.header(UA_KEY);
121124
if (Check.isEmpty(ua)) {
122125
request = request.newBuilder()
123-
.addHeader("user-agent", WAP_USER_AGENT)
126+
.addHeader("user-agent", WAP_Android_USER_AGENT)
124127
.build();
125128
}
126129
try {

app/src/main/java/me/ghui/v2er/network/APIs.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,12 @@ public interface APIs {
9696

9797
@Html
9898
@GET("/my/following")
99+
@Headers("user-agent: " + APIService.WAP_IOS_USER_AGENT)
99100
Observable<CareInfo> specialCareInfo(@Query("p") int page);
100101

101102
@Html
102103
@GET("/my/topics")
104+
@Headers("user-agent: " + APIService.WAP_IOS_USER_AGENT)
103105
Observable<TopicStarInfo> topicStarInfo(@Query("p") int page);
104106

105107
@Html

0 commit comments

Comments
 (0)