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 a12996929..cd8aad1c4 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -23,6 +23,7 @@ import org.json.JSONException; import org.json.JSONObject; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LifecycleUtils; +import ru.vtosters.sponsorpost.utils.GzipDecompressor; import java.io.File; import java.io.FileOutputStream; @@ -168,6 +169,7 @@ public class VideoDownloader { var req = new Request.a() .b("https://" + getApi() + "/method/stories.getById?stories=" + storyId + "&v=5.99&access_token=" + getUserToken()) + .a("Accept-Encoding", "gzip") .a(); Network.b(CLIENT_API).a(req).a(new Callback() { @@ -183,7 +185,7 @@ public class VideoDownloader { progressDialog.cancel(); try { - JSONObject mainJson = new JSONObject(response.a().g()); + JSONObject mainJson = new JSONObject(GzipDecompressor.decompressResponse(response)); JSONObject responseJson = mainJson.getJSONObject("response").optJSONArray("items").optJSONObject(0); StoryEntry story = new StoryEntry(responseJson); StoryDownloader.downloadStory(story); @@ -211,6 +213,7 @@ public class VideoDownloader { var req = new Request.a() .b("https://" + getApi() + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken()) + .a("Accept-Encoding", "gzip") .a(); Network.b(CLIENT_API).a(req).a(new Callback() { @@ -225,7 +228,7 @@ public class VideoDownloader { progressDialog.cancel(); try { - JSONObject mainJson = new JSONObject(response.a().g()); + JSONObject mainJson = new JSONObject(GzipDecompressor.decompressResponse(response)); JSONObject responseJson = mainJson.getJSONObject("response"); JSONArray itemsJson = responseJson.getJSONArray("items"); 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 32e1a47bb..c2ac3f47c 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -1,9 +1,11 @@ package ru.vtosters.lite.foaf; +import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.Context; import android.util.Log; import com.vk.core.dialogs.alert.VkAlertDialog; +import com.vk.core.network.Network; import com.vtosters.lite.R; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -27,6 +29,8 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.vk.core.network.Network.ClientType.CLIENT_API; + public class FoafBase { private static final Pattern FOAF_REGEX = Pattern.compile(" { try { - showFoafInfo(progressDialog, context, i, response.a().g()); + showFoafInfo(progressDialog, context, i, GzipDecompressor.decompressResponse(response)); } catch (IOException e) { throw new RuntimeException(e); } @@ -122,6 +127,7 @@ public class FoafBase { } } + @SuppressLint("DefaultLocale") private static void showFoafDialog(Context context, int i, String normalHumanDate, long daysPassed) { String message = String.format("%s %d%s %s%s %d", context.getString(R.string.foafid), i, context.getString(R.string.foafregdate), normalHumanDate, context.getString(R.string.foafdate), daysPassed); new VkAlertDialog.Builder(context) diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java b/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java index b65202e10..d9b540b9f 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java @@ -13,6 +13,7 @@ import ru.vtosters.lite.di.singleton.VtOkHttpClient; import ru.vtosters.lite.utils.AccountManagerUtils; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.NetworkUtils; +import ru.vtosters.sponsorpost.utils.GzipDecompressor; import java.io.IOException; import java.util.ArrayList; @@ -32,6 +33,7 @@ public class UsersList { Request request = new Request.a() .b(Utils.getDomain() + "/api/getUsersWithServiceDescriptionsAndBanners") + .a("Accept-Encoding", "gzip") .a(); VtOkHttpClient.getInstance().a(request).a(new Callback() { @@ -43,7 +45,7 @@ public class UsersList { @Override public void a(Call call, Response response) { try { - parseJson(new JSONObject(response.a().g()).getJSONObject("response")); + parseJson(new JSONObject(GzipDecompressor.decompressResponse(response)).getJSONObject("response")); } catch (JSONException | IOException e) { e.printStackTrace(); }