y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added proxied static and oauth + refactored by copilot

Browse Source
This commit is contained in:
gdlbo
2022-06-24 10:37:49 +03:00
parent 7205be3749
commit 7b073523fa
34 changed files with 159 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java
+2 -2
View File
@@ -1,8 +1,8 @@
package ru.vtosters.lite.dnr;
import static ru.vtosters.lite.net.Request.makeRequest;
import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Globals.getUserToken;
import static ru.vtosters.lite.utils.Proxy.getApiCom;
import com.vk.core.util.ToastUtils;
import com.vk.im.engine.commands.messages.SetUserActivityCmd;
@@ -51,7 +51,7 @@ public class DNRModule{
}
public static void hookRead(Dialog dialog){
makeRequest("https://" + getApiCom() + "/method/messages.markAsRead?start_message_id=" + dialog.F1() + "&peer_id=" + dialog.getId() + "&v=5.91&access_token=" + getUserToken(), response -> {
makeRequest("https://" + getPrefsValue("proxyapi") + "/method/messages.markAsRead?start_message_id=" + dialog.F1() + "&peer_id=" + dialog.getId() + "&v=5.91&access_token=" + getUserToken(), response -> {
ToastUtils.a("Чат помечен как прочитанный!");
});
}
app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
+2 -2
View File
@@ -3,8 +3,8 @@ package ru.vtosters.lite.foaf;
import static android.widget.Toast.LENGTH_SHORT;
import static android.widget.Toast.makeText;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Globals.getString;
import static ru.vtosters.lite.utils.Proxy.getApiCom;
import static ru.vtosters.lite.utils.Proxy.proxy;
import android.app.ProgressDialog;
@@ -52,7 +52,7 @@ public class FoafBase{
StringBuilder sb;
if(proxy()){
sb = new StringBuilder();
str = "https://" + getApiCom() + "/_/vk.com/foaf.php?id=";
str = "https://" + getPrefsValue("proxyapi") + "/_/vk.com/foaf.php?id=";
} else {
sb = new StringBuilder();
str = "https://vk.com/foaf.php?id=";
app/src/main/java/ru/vtosters/lite/utils/Proxy.java
+31 -48
View File
@@ -5,69 +5,52 @@ import static java.lang.System.getProperties;
import static ru.vtosters.lite.utils.Globals.getPrefsValue;
import static ru.vtosters.lite.utils.Preferences.getBoolValue;
import android.util.Log;
import java.util.Properties;
public class Proxy{
public static String getOauthComAuth(){
return getOauthComHttps() + "/authorize";
}
public static String linkReplacer(String link){
String vkapi = "api.vk.com";
String oauth = "oauth.vk.com";
String vkstatic = "static.vk.com";
public static String getOauthComAuthClient(){
return getOauthComAuth() + "?client_id=";
}
String proxiedvkapi = getPrefsValue("proxyapi");
String proxiedoauth = getPrefsValue("proxyoauth");
String proxedvkstatic = getPrefsValue("proxystatic");
public static String getOauthComBlank(){
return getOauthComHttps() + "/blank.html";
}
if(!proxy() || link.isEmpty()){
return link;
}
public static String getOauthComBlankRedirect(){
return "&redirect_uri=" + getOauthComBlank();
}
if(proxiedvkapi.isEmpty() || proxiedoauth.isEmpty() || proxedvkstatic.isEmpty()){
Log.d("VTLite", "Proxy is not set" + " " + proxiedvkapi + " " + proxiedoauth + " " + proxedvkstatic);
return link;
}
public static String getOauthComHttps(){
return "https://" + getOauthCom();
}
if(link.contains(vkapi)){
return link.replace(proxiedvkapi, vkapi);
}
public static String getStaticComSupport(){
return getStaticCom() + "/support";
}
if(link.contains(oauth)){
return link.replace(proxiedoauth, oauth);
}
public static String oauthFix(){
return "https://oauth.vk.com/blank.html";
}
if(link.contains(vkstatic)){
return link.replace(proxedvkstatic, vkstatic);
}
public static String getApiCom(){
String string = getPrefsValue("proxyapi");
if(!proxy() & string.isEmpty()) return "api.vk.com";
return string;
return link;
}
public static String getAwayPhpCom(){
String string = getPrefsValue("proxyapi");
if(!proxy() & string.isEmpty()) return "m.vk.com";
return string;
}
String proxyapi = getPrefsValue("proxyapi");
public static String getOauthCom(){
String string = getPrefsValue("proxyoauth");
if(!proxy() & string.isEmpty()) return "oauth.vk.com";
return string;
}
if(!proxy() & proxyapi.isEmpty()){
return "m.vk.com";
}
public static String getStaticCom(){
String string = getPrefsValue("proxystatic");
if(!proxy() & string.isEmpty()) return "static.vk.com";
return string;
}
public static String staticFix(String str){
String str2;
String string = getPrefsValue("proxystatic");
if(!proxy() & string.isEmpty()) return str;
str2 = string;
return str.replace(str2, "static.vk.com");
return proxyapi;
}
public static void setProxy(){
smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali
+2 -2
View File
@@ -103,7 +103,7 @@
const-string v0, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
@@ -123,7 +123,7 @@
const-string v0, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
smali/smali_classes2/com/vk/api/base/ApiRequest.smali
+2 -2
View File
@@ -1260,7 +1260,7 @@
move-result-object v0
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
@@ -1269,7 +1269,7 @@
:cond_0
const-string v0, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali
+1 -1
View File
@@ -71,7 +71,7 @@
const-string v0, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali
+4
View File
@@ -114,6 +114,10 @@
const-string v3, "https://oauth.vk.com/blank.html"
invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v3
.line 7
invoke-virtual {p1, v1, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali
+4
View File
@@ -202,6 +202,10 @@
:cond_0
const-string v0, "https://oauth.vk.com/authorize"
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
.line 3
invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali
+4
View File
File diff suppressed because one or more lines are too long
smali/smali_classes2/com/vk/auth/RestoreUtils.smali
+4
View File
@@ -47,6 +47,10 @@
const-string v1, "static.vk.com/restore"
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
.line 21
invoke-virtual {v0, v1}, Landroid/net/Uri$Builder;->appendPath(Ljava/lang/String;)Landroid/net/Uri$Builder;
smali/smali_classes2/com/vk/auth/VkAuthModel.smali
+4
View File
@@ -657,6 +657,10 @@
move-result-object v0
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
if-eqz v0, :cond_0
goto :goto_0
smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali
+4
View File
@@ -56,6 +56,10 @@
const-string v0, "oauth.vk.com"
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
invoke-static {v0, p2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
move-result p2
smali/smali_classes2/com/vk/balance/BalancePresenter.smali
+4
View File
@@ -166,6 +166,10 @@
const-string v2, "https://static.vk.com/promo_codes/"
invoke-static {v2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v2
const/4 v3, 0x2
invoke-direct {v0, v2, v1, v3, v1}, Lcom/vk/webapp/VkUiFragment$a;-><init>(Ljava/lang/String;Ljava/lang/Class;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali
+4
View File
@@ -640,6 +640,10 @@
const-string v0, ""
:goto_0
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getAwayPhpCom()Ljava/lang/String;
move-result-object v0
return-object v0
.end method
smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali
+4
View File
@@ -187,6 +187,10 @@
const-string v3, "https://api.vk.com/method/execute"
invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v3
invoke-static {p1, v3, v1, v0, v2}, Lkotlin/text/l;->c(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
move-result p1
smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali
+1 -1
View File
@@ -275,7 +275,7 @@
const-string v3, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v3
smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali
+4
View File
@@ -56,6 +56,10 @@
const-string v4, "static.vk.com"
invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v4
const/4 v5, 0x2
const/4 v6, 0x0
smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali
+4
View File
@@ -84,6 +84,10 @@
const-string v4, "static.vk.com"
invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v4
const/4 v5, 0x2
const/4 v6, 0x0
smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali
+4
View File
@@ -132,6 +132,10 @@
move-result-object v0
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
if-eqz v0, :cond_0
return-object v0
smali/smali_classes4/com/vk/webapp/VkUiFragment.smali
+5 -1
View File
@@ -1217,6 +1217,10 @@
const-string v3, "static.vk.com"
invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v3
.line 1
invoke-static {p1, v3, v2, v1, v0}, Lkotlin/text/l;->a(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
@@ -1964,7 +1968,7 @@
move-result-object v1
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali
+10
View File
@@ -1471,6 +1471,8 @@
const-string p1, "redirect_uri"
const-string p3, "https://oauth.vk.com/blank.html"
.line 35
invoke-static {p1, p3}, Lkotlin/Tuples;->a(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
@@ -1489,6 +1491,10 @@
move-result-object p1
invoke-static {p1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object p1
goto :goto_0
:cond_0
@@ -1579,6 +1585,10 @@
const-string p3, "https://oauth.vk.com/authorize"
invoke-static {p3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object p3
.line 43
invoke-static {p3}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali
+4
View File
@@ -240,6 +240,10 @@
move-result-object p3
invoke-static {p3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object p3
if-eqz p3, :cond_2
goto :goto_0
smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali
+1 -1
View File
@@ -182,7 +182,7 @@
.line 16
:goto_0
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali
+4
View File
@@ -97,6 +97,10 @@
const-string v4, "oauth.vk.com"
invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v4
invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v3
smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali
+8
View File
@@ -207,6 +207,10 @@
const-string v4, "https://oauth.vk.com/blank.html"
invoke-static {v4}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v4
.line 14
invoke-virtual {v3, v2, v4}, Ljava/util/LinkedHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -292,6 +296,10 @@
const-string v1, "oauth.vk.com"
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
invoke-virtual {v0, v1}, Landroid/net/Uri$Builder;->authority(Ljava/lang/String;)Landroid/net/Uri$Builder;
move-result-object v0
smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali
+1 -1
View File
@@ -82,7 +82,7 @@
.line 3
:goto_0
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali
+4
View File
@@ -326,6 +326,10 @@
const-string v3, "oauth.vk.com"
invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
invoke-virtual {v3, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v1
smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali
+2 -2
View File
@@ -208,7 +208,7 @@
const-string v0, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
@@ -305,7 +305,7 @@
const-string v3, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v3}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v3
smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali
+4
View File
@@ -68,6 +68,10 @@
const-string v1, "oauth.vk.com"
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v0
smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali
+1 -1
View File
@@ -305,7 +305,7 @@
:goto_5
const-string p2, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {p2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object p2
smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali
+9 -1
View File
@@ -1986,6 +1986,10 @@
const-string v1, "static.vk.com"
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
const-string v2, "previous_vkui"
invoke-direct {v0, p1, v1, v2}, Lcom/vtosters/lite/fragments/n2/SettingsDebugFragment$n;-><init>(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V
@@ -2000,6 +2004,10 @@
const-string v2, "previous_oauth"
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
invoke-direct {v0, p1, v1, v2}, Lcom/vtosters/lite/fragments/n2/SettingsDebugFragment$n;-><init>(Landroidx/preference/Preference;Ljava/lang/String;Ljava/lang/String;)V
return-object v0
@@ -2010,7 +2018,7 @@
const-string v1, "api.vk.com"
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali
+8
View File
@@ -40,6 +40,10 @@
const-string v1, "oauth.vk.com"
invoke-static {v1}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v1
invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v0
@@ -178,6 +182,10 @@
const-string v0, "https://oauth.vk.com/blank.html#state=webview_refresh_access_token"
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
.line 2
invoke-virtual {p2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali
+8
View File
@@ -1012,6 +1012,10 @@
const-string v2, "https://oauth.vk.com/webview_token"
invoke-static {v2}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v2
.line 3
invoke-static {v2}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
@@ -1198,6 +1202,10 @@
const-string v0, "https://oauth.vk.com/webview_token"
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
.line 1
invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali
+1 -1
View File
@@ -70,7 +70,7 @@
move-result-object v0
invoke-static {}, Lru/vtosters/lite/utils/Proxy;->getApiCom()Ljava/lang/String;
invoke-static {v0}, Lru/vtosters/lite/utils/Proxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String;
move-result-object v0