From 31a456582b1d11f772cfeb502854b68cefb50c46 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 21 Aug 2022 14:54:14 +0300
Subject: [PATCH] vk.com -> vk.ru
---
README.md | 6 +++---
.../java/ru/vtosters/lite/dnr/DNRInjector.java | 2 +-
.../lite/downloaders/VideoDownloader.java | 6 +++---
.../java/ru/vtosters/lite/foaf/FoafBase.java | 4 ++--
.../ru/vtosters/lite/hooks/JsonInjectors.java | 14 +++++++-------
.../vtosters/lite/hooks/OnlineFormatterHook.java | 2 +-
.../ru/vtosters/lite/music/MP3Downloader.java | 2 +-
.../java/ru/vtosters/lite/proxy/ProxyUtils.java | 2 +-
.../ru/vtosters/lite/proxy/api/ApiProxy.java | 8 ++++----
.../lite/ui/activities/VKAdminTokenActivity.java | 4 ++--
.../vtosters/lite/ui/dialogs/VKIDProtection.java | 2 +-
.../lite/ui/fragments/MediaFragment.java | 2 +-
.../lite/ui/fragments/VKPayFragment.java | 2 +-
smali/AndroidManifest.xml | 16 ++++++++--------
smali/assets/CopyrightAds.txt | 1 +
smali/assets/wiki_template_article.htm | 6 +++---
smali/res/layout/group_admin_info.xml | 2 +-
smali/res/layout/settings_domain.xml | 2 +-
smali/res/values-es/strings.xml | 12 ++++++------
smali/res/values-kk/strings.xml | 12 ++++++------
smali/res/values-pt/strings.xml | 12 ++++++------
smali/res/values-ru/strings.xml | 12 ++++++------
smali/res/values-uk/strings.xml | 12 ++++++------
smali/res/values/strings.xml | 14 +++++++-------
smali/res/xml/network_security_config_debug.xml | 4 ++--
smali/res/xml/preferences_debug.xml | 12 ++++++------
.../com/vk/about/AboutAppFragment$e.smali | 10 +++++-----
.../com/vk/api/apps/AppsGetEmbeddedUrl.smali | 2 +-
.../com/vk/api/apps/ExecuteGetServiceApp.smali | 2 +-
.../com/vk/api/base/ApiConfig$a$a$a.smali | 4 ++--
.../com/vk/api/base/ApiConfig$a$b.smali | 2 +-
.../com/vk/api/base/ApiRequest.smali | 2 +-
.../com/vk/api/board/BoardComment.smali | 2 +-
.../com/vk/api/internal/PingCall.smali | 2 +-
.../com/vk/api/masks/MasksGetModel.smali | 2 +-
.../com/vk/api/sdk/VKApiConfig$6.smali | 2 +-
.../com/vk/api/sdk/auth/VKAuthParams$a.smali | 2 +-
.../com/vk/api/sdk/auth/VKAuthParams.smali | 2 +-
.../com/vk/api/sdk/okhttp/OkHttpExecutor.smali | 2 +-
.../vk/api/sdk/ui/VKWebViewAuthActivity.smali | 2 +-
.../com/vk/api/search/SearchAll.smali | 2 +-
.../authorpage/ArticleAuthorPageHelper.smali | 2 +-
.../vk/articles/preload/WebCachePreloader.smali | 2 +-
.../vk/attachpicker/u/j/FiltersController.smali | 2 +-
.../com/vk/auth/DefaultAuthModel.smali | 6 +++---
.../com/vk/auth/RestoreUtils.smali | 2 +-
.../smali_classes2/com/vk/auth/VkAuthModel.smali | 2 +-
.../com/vk/auth/api/VKAccount.smali | 4 ++--
.../com/vk/auth/y/b/UrlCheckFragment$b.smali | 2 +-
.../com/vk/balance/BalancePresenter$c.smali | 2 +-
.../com/vk/balance/BalancePresenter.smali | 2 +-
.../com/vk/cameraui/CameraUIPresenter.smali | 4 ++--
.../com/vk/cameraui/QrScannerUi.smali | 2 +-
.../vk/common/links/BrowserUtils$Companion.smali | 10 +++++-----
.../com/vk/common/links/LinkParser.smali | 2 +-
.../com/vk/common/links/LinkProcessor$a.smali | 2 +-
.../com/vk/common/links/LinkProcessorKt.smali | 4 ++--
.../com/vk/common/links/OpenFunctionsKt$n.smali | 2 +-
.../metrics/traffic/TrafficAccumulator.smali | 2 +-
.../com/vk/core/network/proxy/NetworkProxy.smali | 8 ++++----
.../com/vk/core/network/proxy/ProxyHost.smali | 4 ++--
.../vk/dto/attachments/SnippetAttachment.smali | 2 +-
.../com/vk/dto/money/MoneyTransfer.smali | 4 ++--
.../com/vk/dto/newsfeed/entries/Post$b.smali | 2 +-
smali/smali_classes2/com/vk/emoji/Emoji.smali | 2 +-
.../core/HttpRequestExecutorProvider.smali | 2 +-
.../com/vk/im/engine/ImConfig.smali | 8 ++++----
.../internal/api_parsers/AttachApiParser.smali | 2 +-
.../internal/api_parsers/CarouselParser.smali | 6 +++---
.../engine/models/attaches/AttachArticle.smali | 2 +-
.../im/engine/models/attaches/AttachArtist.smali | 2 +-
.../im/engine/models/attaches/AttachAudio.smali | 2 +-
.../vk/im/engine/models/attaches/AttachDoc.smali | 2 +-
.../im/engine/models/attaches/AttachEvent.smali | 2 +-
.../models/attaches/AttachGiftSimple.smali | 2 +-
.../attaches/AttachGiftStickersProduct.smali | 2 +-
.../im/engine/models/attaches/AttachImage.smali | 2 +-
.../im/engine/models/attaches/AttachMarket.smali | 2 +-
.../engine/models/attaches/AttachMiniApp.smali | 2 +-
.../engine/models/attaches/AttachNarrative.smali | 2 +-
.../engine/models/attaches/AttachPlaylist.smali | 2 +-
.../models/attaches/AttachPodcastEpisode.smali | 2 +-
.../im/engine/models/attaches/AttachStory.smali | 2 +-
.../im/engine/models/attaches/AttachVideo.smali | 2 +-
.../im/engine/models/attaches/AttachWall.smali | 2 +-
.../engine/models/attaches/AttachWallReply.smali | 2 +-
.../msgparts/MsgPartLinkLargeHolder.smali | 2 +-
.../msgparts/MsgPartLinkSmallHolder.smali | 2 +-
.../msgparts/MsgPartNarrativeHolder.smali | 2 +-
.../im/ui/formatters/MsgAttachFormatter$e.smali | 2 +-
.../com/vk/im/ui/p/ImBridge$b1.smali | 2 +-
.../im/ui/utils/shortcuts/ImShortcutHelper.smali | 2 +-
.../com/vk/im/ui/views/avatars/AvatarView.smali | 2 +-
.../com/vk/imageloader/VKCacheKeyFactory.smali | 4 ++--
.../com/vk/libvideo/VideoFileController.smali | 4 ++--
.../com/vk/libvideo/a0/h/EventsProcessor.smali | 2 +-
.../libvideo/bottomsheet/VideoBottomSheet.smali | 2 +-
.../views/menubutton/MenuButtonPresenter.smali | 2 +-
.../market/orders/MarketOrdersFragment$c.smali | 2 +-
.../holders/MarketCartCheckoutFooterHolder.smali | 4 ++--
.../com/vk/market/picker/GoodsPickerHelper.smali | 2 +-
smali/smali_classes3/com/vk/menu/MenuUtils.smali | 2 +-
.../menu/holders/SearchMenuVkPayHolder$a.smali | 2 +-
.../menu/holders/SearchMenuVkPayHolder$b.smali | 2 +-
.../menu/holders/SearchMenuVkPayHolder$c.smali | 2 +-
.../menu/holders/SearchMenuVkPayHolder$d.smali | 2 +-
.../com/vk/music/playlist/PlaylistsExt.smali | 2 +-
.../episode/PodcastEpisodeFragment$i.smali | 2 +-
.../d/PodcastEpisodeHeaderViewHolder.smali | 2 +-
.../vk/music/podcasts/page/PodcastFragment.smali | 4 ++--
.../podcasts/page/g/PodcastHelpHintHolder.smali | 2 +-
.../newsfeed/adapters/PostTopicsAdapter$b.smali | 2 +-
.../newsfeed/controllers/PostsController.smali | 4 ++--
.../com/vk/newsfeed/holders/HeaderHolder.smali | 2 +-
...ngsFragment$subtitleSpannableString$2$b.smali | 2 +-
.../views/poster/PosterTextDelegate.smali | 2 +-
.../com/vk/polls/utils/PollUtils.smali | 4 ++--
.../CommunityDetailsItemsFactory$autor$1.smali | 2 +-
...CommunityDetailsItemsFactory$contacts$1.smali | 2 +-
.../CommunityDetailsItemsFactory$mention$1.smali | 2 +-
.../CommunityDetailsItemsFactory$wiki$1.smali | 2 +-
...ages$1$$special$$inlined$apply$lambda$1.smali | 2 +-
.../UserDetailsItemsFactory$contacts$1$d.smali | 2 +-
.../adapter/items/CommunityAppButtonItem$a.smali | 2 +-
.../com/vk/profile/ui/BaseProfileFragment.smali | 4 ++--
.../ui/community/CommunityChatsFragment$c.smali | 2 +-
.../ui/community/CommunityChatsFragment.smali | 2 +-
.../profile/ui/community/CommunityFragment.smali | 2 +-
.../community/adresses/FullAddressView$a.smali | 2 +-
.../com/vk/profile/utils/CallToActionExtKt.smali | 2 +-
.../com/vk/pushes/j/NotificationBuilder.smali | 2 +-
.../notifications/im/MessageNotification$a.smali | 2 +-
...haringBottomSheet$$inlined$let$lambda$1.smali | 4 ++--
.../com/vk/sharing/attachment/Attachments.smali | 2 +-
.../holders/SuperAppWidgetVkPayHolder$a.smali | 2 +-
.../com/vk/utils/EntityLinkUtils.smali | 6 +++---
.../com/vk/video/d/VideoEmbedFragment.smali | 2 +-
.../com/vk/video/d/VideoYoutubeFragment.smali | 4 ++--
.../com/vk/voip/VoipBottomSheetDialog$a$a.smali | 2 +-
.../smali_classes4/com/vk/voip/VoipWrapper.smali | 2 +-
.../com/vk/wall/post/CommentsListPresenter.smali | 2 +-
.../vk/wall/thread/CommentThreadPresenter.smali | 2 +-
.../com/vk/webapp/VkUiConnectFragment.smali | 2 +-
.../com/vk/webapp/VkUiFragment$b.smali | 4 ++--
.../com/vk/webapp/VkUiFragment.smali | 4 ++--
.../com/vk/webapp/bridges/AndroidBridge.smali | 8 ++++----
.../vk/webapp/bridges/VkUiConnectBridge$a.smali | 6 +++---
.../vk/webapp/bridges/VkUiConnectBridge.smali | 2 +-
.../com/vk/webapp/consts/WebAppScreenNames.smali | 2 +-
.../impl/VkUiConnectFragmentDelegateImpl.smali | 2 +-
.../com/vk/webapp/helpers/AppsHelper.smali | 2 +-
.../com/vk/webapp/helpers/WebAppApiHelper.smali | 2 +-
.../com/vtosters/lite/LinkSpan.smali | 2 +-
.../com/vtosters/lite/PostPhotoActivity.smali | 2 +-
.../com/vtosters/lite/SDKAuthActivity$d.smali | 2 +-
.../com/vtosters/lite/SDKAuthActivity.smali | 4 ++--
.../com/vtosters/lite/SendActivity.smali | 6 +++---
.../vtosters/lite/ShortcutManagerWrapper.smali | 2 +-
.../lite/VKApplication$initNetwork$1.smali | 2 +-
.../com/vtosters/lite/ValidationActivity$a.smali | 8 ++++----
.../com/vtosters/lite/VideoUploadDialog.smali | 2 +-
...$showAddProduct$$inlined$apply$lambda$1.smali | 2 +-
.../actionlinks/c/a/e/AddPollPresenter.smali | 2 +-
.../views/fragments/add/AddLinkPresenter.smali | 4 ++--
.../com/vtosters/lite/api/AppVKApiCallback.smali | 6 +++---
.../lite/api/execute/GetFullCommunity.smali | 6 +++---
.../lite/attachments/DocumentAttachment.smali | 2 +-
.../lite/attachments/MiniAppAttachment.smali | 2 +-
.../lite/attachments/PhotoAttachment.smali | 2 +-
.../lite/audio/widgets/AudioPlayerWidget$a.smali | 6 +++---
.../lite/fragments/ProfileFragment.smali | 2 +-
.../fragments/SettingsListFragment$f$b.smali | 2 +-
.../lite/fragments/market/GoodFragment.smali | 4 ++--
.../fragments/money/MoneyWebViewFragment$a.smali | 4 ++--
.../lite/fragments/n2/DebugDomainsFilter.smali | 6 +++---
.../fragments/n2/SettingsDebugFragment.smali | 10 +++++-----
.../fragments/o2/BoardTopicViewFragment.smali | 2 +-
.../lite/fragments/o2/BoardTopicsFragment.smali | 2 +-
.../fragments/p2/DocumentsViewFragment.smali | 2 +-
.../fragments/SettingsDomainFragment.smali | 4 ++--
.../general/fragments/WebViewFragment$a.smali | 6 +++---
.../lite/general/fragments/WebViewFragment.smali | 6 +++---
.../general/fragments/WikiViewFragment$f.smali | 4 ++--
.../lite/fragments/y2/VideoAlbumsFragment.smali | 2 +-
...ngineProvider$getApiManager$apiConfig$1.smali | 2 +-
.../com/vtosters/lite/utils/CookieHelper.smali | 2 +-
186 files changed, 316 insertions(+), 315 deletions(-)
diff --git a/README.md b/README.md
index 86f19baf1..714de980c 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
-
+
@@ -133,7 +133,7 @@
`android:debuggable="false"` ➝ `android:debuggable="true"`
-Настройки, необходимые для **отладки** вне Android Studio, находятся по этой ссылке: [vk.com/vt/debug](https://vk.com/vt/debug)
+Настройки, необходимые для **отладки** вне Android Studio, находятся по этой ссылке: [vk.ru/vt/debug](https://vk.ru/vt/debug)
* Для дополнительной отладки ответов и логов необходимо включить **[Режим разработчика]**
@@ -145,7 +145,7 @@
Сразу после нажатия на запись приложение начнет записывать **все ваши действия** по пути `/Download/VK/logs/com.vtosters.lite/`
-При следующем открытии приложения оно автоматически сохранит логи и отправит вам в [**Документы** ВК](https://vk.com/docs), откуда вы можете скачать архив логов и работать с ними.
+При следующем открытии приложения оно автоматически сохранит логи и отправит вам в [**Документы** ВК](https://vk.ru/docs), откуда вы можете скачать архив логов и работать с ними.
## Разработка
diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
index e153c2dba..e4c66d541 100644
--- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
@@ -281,7 +281,7 @@ public class DNRInjector {
Thread thread = new Thread(() -> {
try {
var request = new Request.a()
- .b("https://api.vk.com/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + getUserToken() + "&v=5.119")
+ .b("https://api.vk.ru/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + getUserToken() + "&v=5.119")
.a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
.a();
diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java
index 3edfbc14b..c2c1a0ba6 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java
@@ -127,12 +127,12 @@ public class VideoDownloader {
}
public static void parseVideoLink(String url, Context ctx) {
- if (url.contains("vk.com/story")) {
+ if (url.contains("vk.ru/story")) {
ToastUtils.a(AndroidUtils.getString("video_dl_stories_not_supported"));
return;
}
- if (!url.contains("vk.com/video")) {
+ if (!url.contains("vk.ru/video")) {
ToastUtils.a(AndroidUtils.getString("video_dl_wrong_link"));
return;
}
@@ -144,7 +144,7 @@ public class VideoDownloader {
progressDialog.setMessage(AndroidUtils.getString("video_dl_progress"));
progressDialog.show();
- makeRequest("https://" + "api.vk.com" + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken(),
+ makeRequest("https://" + "api.vk.ru" + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken(),
response -> {
progressDialog.cancel();
diff --git a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
index 93a083d9b..3c0d767f4 100644
--- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
+++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java
@@ -117,10 +117,10 @@ public class FoafBase {
StringBuilder sb;
if (isApiProxyEnabled()) {
sb = new StringBuilder();
- str = "https://" + getApi() + "/_/vk.com/foaf.php?id=";
+ str = "https://" + getApi() + "/_/vk.ru/foaf.php?id=";
} else {
sb = new StringBuilder();
- str = "https://vk.com/foaf.php?id=";
+ str = "https://vk.ru/foaf.php?id=";
}
sb.append(str);
sb.append(i);
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
index 6a0aa72f3..abd0c7596 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
@@ -76,7 +76,7 @@ public class JsonInjectors {
public static JSONObject donateRecomm() throws JSONException {
var title = AndroidUtils.getString("donate_to_vtl");
- var link = "https://vk.com/vtosters_official";
+ var link = "https://vk.ru/vtosters_official";
var text_color = "2D81E0";
var json = new JSONObject();
@@ -118,7 +118,7 @@ public class JsonInjectors {
public static JSONObject vktesters(int id) throws JSONException {
var title = AndroidUtils.getString("tester_profile");
var text_color = "2D81E0";
- var link = "https://static.vk.com/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
+ var link = "https://static.vk.ru/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
var json = new JSONObject();
var icons = new JSONArray();
@@ -567,7 +567,7 @@ public class JsonInjectors {
}
}
- var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
+ var playlists = fetchCatalogId("https://vk.ru/audio?section=my_playlists");
if (playlists != null) {
var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
@@ -580,7 +580,7 @@ public class JsonInjectors {
oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
}
- var albums = fetchCatalogId("https://vk.com/audio?section=albums");
+ var albums = fetchCatalogId("https://vk.ru/audio?section=albums");
if (albums != null) {
var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
@@ -593,7 +593,7 @@ public class JsonInjectors {
oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
}
- var recent = fetchCatalogId("https://vk.com/audio?section=recent");
+ var recent = fetchCatalogId("https://vk.ru/audio?section=recent");
if (recent != null) {
var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
@@ -629,7 +629,7 @@ public class JsonInjectors {
if (section == null) return null;
var request = new Request.a()
- .b("https://api.vk.com/method/catalog.getAudio"
+ .b("https://api.vk.ru/method/catalog.getAudio"
+ "?v=5.119"
+ "&https=1"
+ "&need_blocks=1"
@@ -653,7 +653,7 @@ public class JsonInjectors {
public static JSONObject fetchCatalogPodcast() {
var request = new Request.a()
- .b("https://api.vk.com/method/catalog.getPodcasts"
+ .b("https://api.vk.ru/method/catalog.getPodcasts"
+ "?v=5.119"
+ "&https=1"
+ "&need_blocks=1"
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java b/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java
index b651de25f..549bceb5c 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java
@@ -123,7 +123,7 @@ public class OnlineFormatterHook {
case 5632485:
return "SpaceVK";
case 6287487:
- return "vk.com";
+ return "vk.ru";
case 4542624:
return "Black VK";
case 3917910:
diff --git a/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java b/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java
index bc62999de..2d208c531 100644
--- a/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java
+++ b/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java
@@ -28,7 +28,7 @@ import ru.vtosters.lite.utils.AndroidUtils;
public class MP3Downloader {
- private static final String URL_FORMAT = "https://api.vk.com/method/audio.getById?v=5.131&access_token=%s&audios=%s©right=https://vtosters.app/";
+ private static final String URL_FORMAT = "https://api.vk.ru/method/audio.getById?v=5.131&access_token=%s&audios=%s©right=https://vtosters.app/";
private static final OkHttpClient client = new OkHttpClient();
public static void execute(MusicTrack track) {
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java
index 90530f2fd..bc435d545 100644
--- a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java
@@ -27,7 +27,7 @@ public class ProxyUtils{
return proxyapi;
}
- return "api.vk.com";
+ return "api.vk.ru";
}
public static Boolean isZaboronaEnabled(){
diff --git a/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java
index afba81a7a..a9f3ba6db 100644
--- a/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java
+++ b/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java
@@ -7,9 +7,9 @@ import android.util.Log;
public class ApiProxy{
public static String linkReplacer(String link){
- var vkapi = "api.vk.com";
- var oauth = "oauth.vk.com";
- var vkstatic = "static.vk.com";
+ var vkapi = "api.vk.ru";
+ var oauth = "oauth.vk.ru";
+ var vkstatic = "static.vk.ru";
var proxyapi = getPrefsValue("proxyapi");
var proxyoauth = getPrefsValue("proxyoauth");
@@ -52,6 +52,6 @@ public class ApiProxy{
return proxyapi;
}
- return "m.vk.com";
+ return "m.vk.ru";
}
}
diff --git a/app/src/main/java/ru/vtosters/lite/ui/activities/VKAdminTokenActivity.java b/app/src/main/java/ru/vtosters/lite/ui/activities/VKAdminTokenActivity.java
index 7334a296c..15fb9e2b1 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/activities/VKAdminTokenActivity.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/activities/VKAdminTokenActivity.java
@@ -20,7 +20,7 @@ import ru.vtosters.lite.utils.LayoutUtils;
public class VKAdminTokenActivity extends AppCompatActivity {
- private static final String URL = "https://oauth.vk.com/authorize?client_id=6121396&scope=1073737727&redirect_uri=https://oauth.vk.com/blank.html&display=page&response_type=token&revoke=1";
+ private static final String URL = "https://oauth.vk.ru/authorize?client_id=6121396&scope=1073737727&redirect_uri=https://oauth.vk.ru/blank.html&display=page&response_type=token&revoke=1";
@Override
protected void onCreate(@Nullable Bundle bundle) {
@@ -37,7 +37,7 @@ public class VKAdminTokenActivity extends AppCompatActivity {
@Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
var url = request.getUrl().toString();
- if (url.startsWith("https://oauth.vk.com/auth_redirect?")) {
+ if (url.startsWith("https://oauth.vk.ru/auth_redirect?")) {
var redirectUri = Uri.parse(URLDecoder.decode(url));
var authorizeUrl = redirectUri.getQueryParameter("authorize_url");
var accessToken = authorizeUrl.substring(authorizeUrl.indexOf("=") + 1, authorizeUrl.indexOf("&"));
diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java
index a3f786986..6540b3df7 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java
@@ -23,7 +23,7 @@ public class VKIDProtection {
// android.content.DialogInterface.OnClickListener
builder.setNeutralButton(getString("vkiddisable"), (dialogInterface, i) -> {
edit().putBoolean("showAlertVkId", false).apply();
- VKUIwrapper.setLink("https://id.vk.com/account");
+ VKUIwrapper.setLink("https://id.vk.ru/account");
Intent a2 = new Navigator(VKUIwrapper.class).b(activity);
a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
activity.startActivity(a2);
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
index 5cdafa15f..8e8b32fdf 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
@@ -244,7 +244,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
Thread thread = new Thread(() -> {
try {
var request = new Request.a()
- .b("https://api.vk.com/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
+ .b("https://api.vk.ru/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
.a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
.a();
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VKPayFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VKPayFragment.java
index d57f055ad..3fd7b9601 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VKPayFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VKPayFragment.java
@@ -14,7 +14,7 @@ public class VKPayFragment extends FragmentImpl {
}
public void start() {
- VKUIwrapper.setLink("https://vk.com/vkpay");
+ VKUIwrapper.setLink("https://vk.ru/vkpay");
Intent a2 = new Navigator(VKUIwrapper.class).b(getActivity());
a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(a2);
diff --git a/smali/AndroidManifest.xml b/smali/AndroidManifest.xml
index 99fa5b4b9..ac1d6cff9 100644
--- a/smali/AndroidManifest.xml
+++ b/smali/AndroidManifest.xml
@@ -961,7 +961,7 @@
@@ -983,7 +983,7 @@
@@ -994,7 +994,7 @@
@@ -1016,7 +1016,7 @@
@@ -1109,7 +1109,7 @@
@@ -1121,7 +1121,7 @@
@@ -1132,7 +1132,7 @@
@@ -1143,7 +1143,7 @@
diff --git a/smali/assets/CopyrightAds.txt b/smali/assets/CopyrightAds.txt
index 6f36f1cfe..69f29ebb8 100644
--- a/smali/assets/CopyrightAds.txt
+++ b/smali/assets/CopyrightAds.txt
@@ -1,6 +1,7 @@
appscent
//t.me/
vk.com
+vk.ru
apps-cent
app-cent
appcent
diff --git a/smali/assets/wiki_template_article.htm b/smali/assets/wiki_template_article.htm
index ba323e18f..98e5eea50 100644
--- a/smali/assets/wiki_template_article.htm
+++ b/smali/assets/wiki_template_article.htm
@@ -394,12 +394,12 @@ function showPhotosBox(url, id, num, link){
diff --git a/smali/res/layout/group_admin_info.xml b/smali/res/layout/group_admin_info.xml
index 147ca38fd..ec0efb62f 100644
--- a/smali/res/layout/group_admin_info.xml
+++ b/smali/res/layout/group_admin_info.xml
@@ -85,7 +85,7 @@
android:layout_height="wrap_content"
android:background="@null"
android:padding="0.0dip"
- android:text="https://vk.com/"
+ android:text="https://vk.ru/"
android:textColor="#ffb8b8b8" />