From 0d1300a4aef5a3d99826b64252aa05cf9298ed6b Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Tue, 24 Dec 2019 01:59:35 +0530 Subject: [PATCH 1/5] Add new token-dispenser --- app/build.gradle | 16 +++-- .../yeriomin/yalpstore/AppListIterator.java | 8 +-- .../yalpstore/CredentialsEmptyException.java | 2 +- .../yeriomin/yalpstore/DetailsActivity.java | 6 +- .../yeriomin/yalpstore/DeveloperActivity.java | 12 ++-- .../yalpstore/NativeDeviceInfoProvider.java | 10 +-- .../yalpstore/NativeHttpClientAdapter.java | 8 +-- .../yalpstore/PlayStoreApiAuthenticator.java | 65 +++++++++---------- .../yalpstore/ReviewRetrieverIterator.java | 4 +- .../yalpstore/TokenDispenserMirrors.java | 6 +- .../com/github/yeriomin/yalpstore/Util.java | 4 +- .../yeriomin/yalpstore/WishlistActivity.java | 4 +- .../YalpStoreSuggestionProvider.java | 6 +- .../yalpstore/delta/PatcherFactory.java | 2 +- .../yalpstore/download/DownloadManager.java | 2 +- .../yalpstore/download/RequestBuilder.java | 12 ++-- .../yalpstore/download/RequestDelta.java | 2 +- .../yalpstore/fragment/ButtonDownload.java | 2 +- .../yalpstore/fragment/details/Beta.java | 2 +- .../github/yeriomin/yalpstore/model/App.java | 2 +- .../yeriomin/yalpstore/model/AppBuilder.java | 20 +++--- .../yalpstore/model/ReviewBuilder.java | 6 +- .../playstore/BackgroundPurchaseTask.java | 2 +- .../task/playstore/BetaToggleTask.java | 2 +- .../task/playstore/CategoryAppsTask.java | 4 +- .../task/playstore/CategoryTask.java | 6 +- .../task/playstore/ChangelogTask.java | 2 +- .../task/playstore/CheckCredentialsTask.java | 6 +- .../yalpstore/task/playstore/ClusterTask.java | 2 +- .../task/playstore/DeliveryDataTask.java | 8 +-- .../playstore/DependencyTranslationTask.java | 2 +- .../yalpstore/task/playstore/DetailsTask.java | 6 +- .../task/playstore/DownloadLinkTask.java | 2 +- .../task/playstore/EndlessScrollTask.java | 6 +- .../yalpstore/task/playstore/FlagTask.java | 2 +- .../ForegroundUpdatableAppsTask.java | 2 +- .../task/playstore/PlayStorePayloadTask.java | 4 +- .../task/playstore/PlayStoreTask.java | 2 +- .../task/playstore/PurchaseCheckTask.java | 2 +- .../task/playstore/PurchaseTask.java | 6 +- .../task/playstore/RemoteAppListTask.java | 4 +- .../task/playstore/ReviewAddTask.java | 4 +- .../task/playstore/ReviewDeleteTask.java | 2 +- .../task/playstore/ReviewLoadTask.java | 2 +- .../yalpstore/task/playstore/SearchTask.java | 2 +- .../task/playstore/UpdatableAppsTask.java | 2 +- .../task/playstore/UserProfileTask.java | 6 +- .../task/playstore/WishlistToggleTask.java | 2 +- .../task/playstore/WishlistUpdateTask.java | 6 +- .../yalpstore/view/FlagDialogBuilder.java | 2 +- .../yalpstore/view/LoginDialogBuilder.java | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 53 files changed, 154 insertions(+), 153 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0b92c637..d5168b50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.2' + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } def getCurrentFlavor = { -> if (getGradle().getStartParameter().getTaskRequests().toString().contains("legacy")) { @@ -27,7 +32,7 @@ android { defaultConfig { applicationId "com.github.yeriomin.yalpstore" minSdkVersion 5 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 45 versionName getVersionName() vectorDrawables.useSupportLibrary = true @@ -68,9 +73,8 @@ dependencies { contemporaryImplementation 'com.android.support:design:28.0.0' contemporaryImplementation 'com.android.support:appcompat-v7:28.0.0' implementation 'info.guardianproject.netcipher:netcipher:2.0.0-beta1' - implementation 'commons-net:commons-net:3.5' + implementation 'commons-net:commons-net:3.6' implementation 'com.nothome:javaxdelta:2.0.1' - debugImplementation ('com.github.yeriomin:play-store-api:master-SNAPSHOT') { changing = true } - releaseImplementation 'com.github.yeriomin:play-store-api:0.44.2' + implementation 'com.github.whyorean:playstore-api-v2:2.4' implementation 'eu.chainfire:libsuperuser:1.0.0.201608240809' } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/AppListIterator.java b/app/src/main/java/com/github/yeriomin/yalpstore/AppListIterator.java index 6543f7d9..c3e4c335 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/AppListIterator.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/AppListIterator.java @@ -21,8 +21,8 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.DocV2; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.DocV2; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.App; import com.github.yeriomin.yalpstore.model.AppBuilder; import com.github.yeriomin.yalpstore.model.Filter; @@ -34,9 +34,9 @@ public class AppListIterator implements Iterator { private Filter filter; - protected com.github.yeriomin.playstoreapi.AppListIterator iterator; + protected com.dragons.aurora.playstoreapiv2.AppListIterator iterator; - public AppListIterator(com.github.yeriomin.playstoreapi.AppListIterator iterator) { + public AppListIterator(com.dragons.aurora.playstoreapiv2.AppListIterator iterator) { this.iterator = iterator; } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/CredentialsEmptyException.java b/app/src/main/java/com/github/yeriomin/yalpstore/CredentialsEmptyException.java index cfd7daf6..2661613b 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/CredentialsEmptyException.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/CredentialsEmptyException.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore; -import com.github.yeriomin.playstoreapi.AuthException; +import com.dragons.aurora.playstoreapiv2.AuthException; public class CredentialsEmptyException extends AuthException { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java index 8ab0bc6a..7a24de38 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java @@ -32,9 +32,9 @@ import android.view.View; import android.widget.TextView; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.GooglePlayException; -import com.github.yeriomin.playstoreapi.ReviewResponse; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayException; +import com.dragons.aurora.playstoreapiv2.ReviewResponse; import com.github.yeriomin.yalpstore.download.DetailsProgressListener; import com.github.yeriomin.yalpstore.download.DownloadManager; import com.github.yeriomin.yalpstore.fragment.ButtonCancel; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DeveloperActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/DeveloperActivity.java index 44eb1914..e37f245c 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DeveloperActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/DeveloperActivity.java @@ -24,15 +24,15 @@ import android.text.TextUtils; import android.util.Log; -import com.github.yeriomin.playstoreapi.Base64; -import com.github.yeriomin.playstoreapi.DeveloperAppsRequest; -import com.github.yeriomin.playstoreapi.DeveloperIdContainer; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.UrlRequestWrapper; +import com.dragons.aurora.playstoreapiv2.Base64; +import com.dragons.aurora.playstoreapiv2.DeveloperAppsRequest; +import com.dragons.aurora.playstoreapiv2.DeveloperIdContainer; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.UrlRequestWrapper; import java.net.URLEncoder; -import static com.github.yeriomin.playstoreapi.Base64.NO_WRAP; +import static com.dragons.aurora.playstoreapiv2.Base64.NO_WRAP; public class DeveloperActivity extends YalpStoreActivity { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java b/app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java index 1c829c0e..1c1d1e11 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java @@ -28,11 +28,11 @@ import android.text.TextUtils; import android.util.DisplayMetrics; -import com.github.yeriomin.playstoreapi.AndroidBuildProto; -import com.github.yeriomin.playstoreapi.AndroidCheckinProto; -import com.github.yeriomin.playstoreapi.AndroidCheckinRequest; -import com.github.yeriomin.playstoreapi.DeviceConfigurationProto; -import com.github.yeriomin.playstoreapi.DeviceInfoProvider; +import com.dragons.aurora.playstoreapiv2.AndroidBuildProto; +import com.dragons.aurora.playstoreapiv2.AndroidCheckinProto; +import com.dragons.aurora.playstoreapiv2.AndroidCheckinRequest; +import com.dragons.aurora.playstoreapiv2.DeviceConfigurationProto; +import com.dragons.aurora.playstoreapiv2.DeviceInfoProvider; import java.net.URLEncoder; import java.util.ArrayList; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/NativeHttpClientAdapter.java b/app/src/main/java/com/github/yeriomin/yalpstore/NativeHttpClientAdapter.java index 69b0e787..6dad66c5 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/NativeHttpClientAdapter.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/NativeHttpClientAdapter.java @@ -24,10 +24,10 @@ import android.text.TextUtils; import android.util.Log; -import com.github.yeriomin.playstoreapi.AuthException; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.GooglePlayException; -import com.github.yeriomin.playstoreapi.HttpClientAdapter; +import com.dragons.aurora.playstoreapiv2.AuthException; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayException; +import com.dragons.aurora.playstoreapiv2.HttpClientAdapter; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java b/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java index 4dcc93ea..cc6d17ab 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiAuthenticator.java @@ -24,12 +24,13 @@ import android.text.TextUtils; import android.util.Log; -import com.github.yeriomin.playstoreapi.ApiBuilderException; -import com.github.yeriomin.playstoreapi.AuthException; -import com.github.yeriomin.playstoreapi.DeviceInfoProvider; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.PropertiesDeviceInfoProvider; -import com.github.yeriomin.playstoreapi.TokenDispenserException; +import com.dragons.aurora.playstoreapiv2.ApiBuilderException; +import com.dragons.aurora.playstoreapiv2.AuthException; +import com.dragons.aurora.playstoreapiv2.DeviceInfoProvider; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.PlayStoreApiBuilder; +import com.dragons.aurora.playstoreapiv2.PropertiesDeviceInfoProvider; +import com.dragons.aurora.playstoreapiv2.TokenDispenserException; import com.github.yeriomin.yalpstore.model.LoginInfo; import com.github.yeriomin.yalpstore.model.LoginInfoDao; import com.github.yeriomin.yalpstore.task.playstore.BackgroundCategoryTask; @@ -48,16 +49,10 @@ public class PlayStoreApiAuthenticator { public static final String PREFERENCE_USER_ID = "PREFERENCE_USER_ID"; static private final int RETRIES = 5; - - private Context context; - private Set onLoginTasks = new HashSet<>(); - private static GooglePlayAPI api; private static TokenDispenserMirrors tokenDispenserMirrors = new TokenDispenserMirrors(); - - public static void forceRelogin() { - api = null; - } + private Context context; + private Set onLoginTasks = new HashSet<>(); public PlayStoreApiAuthenticator(Context context) { this.context = context; @@ -68,6 +63,10 @@ public PlayStoreApiAuthenticator(Context context) { onLoginTasks.add(new UserProfileTask()); } + public static void forceRelogin() { + api = null; + } + public GooglePlayAPI getApi() throws IOException { if (api == null) { if (!YalpStoreApplication.user.isLoggedIn()) { @@ -127,7 +126,7 @@ private GooglePlayAPI build(LoginInfo loginInfo, int retries) throws IOException tokenDispenserMirrors.reset(); while (tried < retries) { try { - com.github.yeriomin.playstoreapi.PlayStoreApiBuilder builder = getBuilder(loginInfo); + com.dragons.aurora.playstoreapiv2.PlayStoreApiBuilder builder = getBuilder(loginInfo); GooglePlayAPI api = builder.build(); loginInfo.setEmail(builder.getEmail()); return api; @@ -151,25 +150,25 @@ private GooglePlayAPI build(LoginInfo loginInfo, int retries) throws IOException } } throw loginInfo.appProvidedEmail() - ? new TokenDispenserException("Try again later") - : new IOException("Unknown error happened during login") - ; + ? new TokenDispenserException("Try again later") + : new IOException("Unknown error happened during login") + ; } - private com.github.yeriomin.playstoreapi.PlayStoreApiBuilder getBuilder(LoginInfo loginInfo) { - return new com.github.yeriomin.playstoreapi.PlayStoreApiBuilder() - .setHttpClient(BuildConfig.DEBUG ? new DebugHttpClientAdapter() : new NativeHttpClientAdapter()) - .setDeviceInfoProvider(getDeviceInfoProvider(loginInfo.getDeviceDefinitionName())) - .setLocale(loginInfo.getLocale()) - .setEmail(loginInfo.getEmail()) - .setPassword(loginInfo.getPassword()) - .setGsfId(loginInfo.getGsfId()) - .setToken(loginInfo.getToken()) - .setTokenDispenserUrl(loginInfo.getTokenDispenserUrl()) - .setDeviceCheckinConsistencyToken(loginInfo.getDeviceCheckinConsistencyToken()) - .setDeviceConfigToken(loginInfo.getDeviceConfigToken()) - .setDfeCookie(loginInfo.getDfeCookie()) - ; + private PlayStoreApiBuilder getBuilder(LoginInfo loginInfo) { + PlayStoreApiBuilder builder = new PlayStoreApiBuilder(); + builder.setHttpClient(BuildConfig.DEBUG ? new DebugHttpClientAdapter() : new NativeHttpClientAdapter()); + builder.setDeviceInfoProvider(getDeviceInfoProvider(loginInfo.getDeviceDefinitionName())); + builder.setLocale(loginInfo.getLocale()); + builder.setEmail(loginInfo.getEmail()); + builder.setAasToken(loginInfo.getPassword()); + builder.setGsfId(loginInfo.getGsfId()); + builder.setAuthToken(loginInfo.getToken()); + builder.setTokenDispenserUrl(loginInfo.getTokenDispenserUrl()); + builder.setDeviceCheckinConsistencyToken(loginInfo.getDeviceCheckinConsistencyToken()); + builder.setDeviceConfigToken(loginInfo.getDeviceConfigToken()); + builder.setDfeCookie(loginInfo.getDfeCookie()); + return builder; } private DeviceInfoProvider getDeviceInfoProvider(String spoofDevice) { @@ -197,7 +196,7 @@ private void save(LoginInfo loginInfo) { } private void runOnLoginTasks() { - for (PlayStorePayloadTask task: onLoginTasks) { + for (PlayStorePayloadTask task : onLoginTasks) { task.setContext(context); task.executeOnExecutorIfPossible(); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewRetrieverIterator.java b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewRetrieverIterator.java index d0c0c64b..7c1cdc68 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewRetrieverIterator.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewRetrieverIterator.java @@ -21,7 +21,7 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.Review; import com.github.yeriomin.yalpstore.model.ReviewBuilder; @@ -58,7 +58,7 @@ public List next() { private List getReviews(String packageId, int offset, int numberOfResults) throws IOException { List reviews = new ArrayList<>(); - for (com.github.yeriomin.playstoreapi.Review review: new PlayStoreApiAuthenticator(context).getApi().reviews( + for (com.dragons.aurora.playstoreapiv2.Review review: new PlayStoreApiAuthenticator(context).getApi().reviews( packageId, GooglePlayAPI.REVIEW_SORT.HELPFUL, offset, diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/TokenDispenserMirrors.java b/app/src/main/java/com/github/yeriomin/yalpstore/TokenDispenserMirrors.java index c86282f3..93bb50a2 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/TokenDispenserMirrors.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/TokenDispenserMirrors.java @@ -24,10 +24,8 @@ public class TokenDispenserMirrors { private int n = 0; static private String[] mirrors = new String[] { - "https://token-dispenser.herokuapp.com", - "https://token-dispenser-mirror.herokuapp.com", - "http://route-token-dispenser.193b.starter-ca-central-1.openshiftapps.com", - "http://token-dispenser.duckdns.org:8080" + "http://auroraoss.com:8080", + "http://auroraoss.in:8080" }; public void reset() { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/Util.java b/app/src/main/java/com/github/yeriomin/yalpstore/Util.java index 6761512c..b9599ab9 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/Util.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/Util.java @@ -170,9 +170,9 @@ static public byte[] getFileChecksum(File file) { } public static byte[] base64StringToByteArray(String string) { - return com.github.yeriomin.playstoreapi.Base64.decode( + return com.dragons.aurora.playstoreapiv2.Base64.decode( string, - com.github.yeriomin.playstoreapi.Base64.URL_SAFE | com.github.yeriomin.playstoreapi.Base64.NO_PADDING + com.dragons.aurora.playstoreapiv2.Base64.URL_SAFE | com.dragons.aurora.playstoreapiv2.Base64.NO_PADDING ); } } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/WishlistActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/WishlistActivity.java index b9f72d57..c5b92dfa 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/WishlistActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/WishlistActivity.java @@ -25,8 +25,8 @@ import android.widget.AdapterView; import android.widget.TextView; -import com.github.yeriomin.playstoreapi.BulkDetailsEntry; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.BulkDetailsEntry; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.App; import com.github.yeriomin.yalpstore.model.AppBuilder; import com.github.yeriomin.yalpstore.task.playstore.CloneableTask; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreSuggestionProvider.java b/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreSuggestionProvider.java index 708aa656..7b0720a2 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreSuggestionProvider.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreSuggestionProvider.java @@ -29,9 +29,9 @@ import android.text.TextUtils; import android.util.Log; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.GooglePlayException; -import com.github.yeriomin.playstoreapi.SearchSuggestEntry; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayException; +import com.dragons.aurora.playstoreapiv2.SearchSuggestEntry; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/delta/PatcherFactory.java b/app/src/main/java/com/github/yeriomin/yalpstore/delta/PatcherFactory.java index 2c49b771..1191b1e6 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/delta/PatcherFactory.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/delta/PatcherFactory.java @@ -21,7 +21,7 @@ import android.content.Context; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.App; public class PatcherFactory { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/download/DownloadManager.java b/app/src/main/java/com/github/yeriomin/yalpstore/download/DownloadManager.java index 1cc37884..c7901630 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/download/DownloadManager.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/download/DownloadManager.java @@ -27,7 +27,7 @@ import android.os.StatFs; import android.util.Log; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.InstalledApkCopier; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestBuilder.java index 16ead742..52e151d8 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestBuilder.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestBuilder.java @@ -21,12 +21,12 @@ import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; -import com.github.yeriomin.playstoreapi.AndroidAppPatchData; -import com.github.yeriomin.playstoreapi.AppFileMetadata; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.HttpCookie; -import com.github.yeriomin.playstoreapi.Split; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AndroidAppPatchData; +import com.dragons.aurora.playstoreapiv2.AppFileMetadata; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.HttpCookie; +import com.dragons.aurora.playstoreapiv2.Split; import com.github.yeriomin.yalpstore.Util; import java.util.ArrayList; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestDelta.java b/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestDelta.java index f86c7ba3..4c6f75c8 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestDelta.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/download/RequestDelta.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.download; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; public class RequestDelta extends Request { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/ButtonDownload.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/ButtonDownload.java index 1694ee3b..806960a4 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/ButtonDownload.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/ButtonDownload.java @@ -23,7 +23,7 @@ import android.util.Log; import android.view.View; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; import com.github.yeriomin.yalpstore.BuildConfig; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.ManualDownloadActivity; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Beta.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Beta.java index 44ab8eb0..e82b35b0 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Beta.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Beta.java @@ -24,7 +24,7 @@ import android.widget.EditText; import android.widget.TextView; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/model/App.java b/app/src/main/java/com/github/yeriomin/yalpstore/model/App.java index 60d4d385..9f7d0f41 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/model/App.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/model/App.java @@ -23,7 +23,7 @@ import android.content.pm.PackageInfo; import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.R; import java.util.ArrayList; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/model/AppBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/model/AppBuilder.java index 9a28a146..15051b8d 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/model/AppBuilder.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/model/AppBuilder.java @@ -21,16 +21,16 @@ import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.AggregateRating; -import com.github.yeriomin.playstoreapi.AppDetails; -import com.github.yeriomin.playstoreapi.Badge; -import com.github.yeriomin.playstoreapi.Dependency; -import com.github.yeriomin.playstoreapi.DetailsResponse; -import com.github.yeriomin.playstoreapi.DocV2; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.Image; -import com.github.yeriomin.playstoreapi.RelatedLink; -import com.github.yeriomin.playstoreapi.Unknown25Item; +import com.dragons.aurora.playstoreapiv2.AggregateRating; +import com.dragons.aurora.playstoreapiv2.AppDetails; +import com.dragons.aurora.playstoreapiv2.Badge; +import com.dragons.aurora.playstoreapiv2.Dependency; +import com.dragons.aurora.playstoreapiv2.DetailsResponse; +import com.dragons.aurora.playstoreapiv2.DocV2; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.Image; +import com.dragons.aurora.playstoreapiv2.RelatedLink; +import com.dragons.aurora.playstoreapiv2.Unknown25Item; import com.github.yeriomin.yalpstore.Util; import java.util.List; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/model/ReviewBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/model/ReviewBuilder.java index cd5dc221..eef9d141 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/model/ReviewBuilder.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/model/ReviewBuilder.java @@ -19,12 +19,12 @@ package com.github.yeriomin.yalpstore.model; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.Image; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.Image; public class ReviewBuilder { - public static Review build(com.github.yeriomin.playstoreapi.Review reviewProto) { + public static Review build(com.dragons.aurora.playstoreapiv2.Review reviewProto) { Review review = new Review(); review.setComment(reviewProto.getComment()); review.setTitle(reviewProto.getTitle()); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BackgroundPurchaseTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BackgroundPurchaseTask.java index 88afa8b1..974a9cf5 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BackgroundPurchaseTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BackgroundPurchaseTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.notification.NotificationManagerWrapper; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BetaToggleTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BetaToggleTask.java index 6294060a..764c5d55 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BetaToggleTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/BetaToggleTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.App; import java.io.IOException; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryAppsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryAppsTask.java index f6d8f7c6..f4e3da1a 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryAppsTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryAppsTask.java @@ -19,8 +19,8 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.CategoryAppsIterator; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.CategoryAppsIterator; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.AppListIterator; import com.github.yeriomin.yalpstore.PlayStoreApiAuthenticator; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryTask.java index 72c542d1..33de9965 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CategoryTask.java @@ -21,9 +21,9 @@ import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.DocV2; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.ListResponse; +import com.dragons.aurora.playstoreapiv2.DocV2; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.ListResponse; import com.github.yeriomin.yalpstore.CategoryManager; import java.io.IOException; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ChangelogTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ChangelogTask.java index d304b6d4..317b5f46 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ChangelogTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ChangelogTask.java @@ -23,7 +23,7 @@ import android.database.sqlite.SQLiteDatabase; import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.SqliteHelper; import com.github.yeriomin.yalpstore.model.App; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CheckCredentialsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CheckCredentialsTask.java index 48f8aee6..a4a3becc 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CheckCredentialsTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/CheckCredentialsTask.java @@ -26,9 +26,9 @@ import android.text.TextUtils; import android.util.Log; -import com.github.yeriomin.playstoreapi.AuthException; -import com.github.yeriomin.playstoreapi.GooglePlayException; -import com.github.yeriomin.playstoreapi.TokenDispenserException; +import com.dragons.aurora.playstoreapiv2.AuthException; +import com.dragons.aurora.playstoreapiv2.GooglePlayException; +import com.dragons.aurora.playstoreapiv2.TokenDispenserException; import com.github.yeriomin.yalpstore.BaseActivity; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.CredentialsEmptyException; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ClusterTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ClusterTask.java index 60289a18..3fc53862 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ClusterTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ClusterTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.UrlIterator; +import com.dragons.aurora.playstoreapiv2.UrlIterator; import com.github.yeriomin.yalpstore.AppListIterator; import com.github.yeriomin.yalpstore.PlayStoreApiAuthenticator; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java index 5e82f548..ac3fe6e8 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java @@ -21,10 +21,10 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; -import com.github.yeriomin.playstoreapi.BuyResponse; -import com.github.yeriomin.playstoreapi.DeliveryResponse; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.BuyResponse; +import com.dragons.aurora.playstoreapiv2.DeliveryResponse; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.NotPurchasedException; import com.github.yeriomin.yalpstore.PreferenceUtil; import com.github.yeriomin.yalpstore.YalpStoreApplication; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DependencyTranslationTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DependencyTranslationTask.java index 11287ce2..2621348a 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DependencyTranslationTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DependencyTranslationTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.App; import java.io.IOException; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DetailsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DetailsTask.java index 730c2a6f..bf851ae7 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DetailsTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DetailsTask.java @@ -21,9 +21,9 @@ import android.content.pm.PackageManager; -import com.github.yeriomin.playstoreapi.DetailsResponse; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.GooglePlayException; +import com.dragons.aurora.playstoreapiv2.DetailsResponse; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayException; import com.github.yeriomin.yalpstore.BuildConfig; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DownloadLinkTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DownloadLinkTask.java index a465377f..c8a11a62 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DownloadLinkTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DownloadLinkTask.java @@ -23,7 +23,7 @@ import android.net.Uri; import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/EndlessScrollTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/EndlessScrollTask.java index 7943429b..d2a8cc8d 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/EndlessScrollTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/EndlessScrollTask.java @@ -21,9 +21,9 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.GooglePlayException; -import com.github.yeriomin.playstoreapi.IteratorGooglePlayException; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayException; +import com.dragons.aurora.playstoreapiv2.IteratorGooglePlayException; import com.github.yeriomin.yalpstore.AppListIterator; import com.github.yeriomin.yalpstore.EndlessScrollActivity; import com.github.yeriomin.yalpstore.PlayStoreApiAuthenticator; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/FlagTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/FlagTask.java index f4851cb1..96b287cf 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/FlagTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/FlagTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ForegroundUpdatableAppsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ForegroundUpdatableAppsTask.java index e6f9fa37..2beda4ab 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ForegroundUpdatableAppsTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ForegroundUpdatableAppsTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.BlackWhiteListManager; import com.github.yeriomin.yalpstore.BuildConfig; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStorePayloadTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStorePayloadTask.java index 82289607..cc50456c 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStorePayloadTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStorePayloadTask.java @@ -23,8 +23,8 @@ import android.database.sqlite.SQLiteDatabase; import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.IteratorGooglePlayException; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.IteratorGooglePlayException; import com.github.yeriomin.yalpstore.BaseActivity; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.PlayStoreApiAuthenticator; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStoreTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStoreTask.java index f78c7ba8..e97cf020 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStoreTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PlayStoreTask.java @@ -24,7 +24,7 @@ import android.util.Log; import android.widget.TextView; -import com.github.yeriomin.playstoreapi.AuthException; +import com.dragons.aurora.playstoreapiv2.AuthException; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.CredentialsEmptyException; import com.github.yeriomin.yalpstore.FirstLaunchChecker; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseCheckTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseCheckTask.java index 76479c6e..9f32cd18 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseCheckTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseCheckTask.java @@ -23,7 +23,7 @@ import android.view.View; import android.widget.Button; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; import com.github.yeriomin.yalpstore.ManualDownloadActivity; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseTask.java index 048758a8..ffd6cf7b 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/PurchaseTask.java @@ -26,9 +26,9 @@ import android.util.Log; import android.view.WindowManager; -import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; -import com.github.yeriomin.playstoreapi.AuthException; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData; +import com.dragons.aurora.playstoreapiv2.AuthException; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.NotPurchasedException; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/RemoteAppListTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/RemoteAppListTask.java index 47cadf57..6dd5d7c3 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/RemoteAppListTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/RemoteAppListTask.java @@ -19,8 +19,8 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.BulkDetailsEntry; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.BulkDetailsEntry; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.model.App; import com.github.yeriomin.yalpstore.model.AppBuilder; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewAddTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewAddTask.java index 66866aaa..cde9e053 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewAddTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewAddTask.java @@ -21,8 +21,8 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.ReviewResponse; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.ReviewResponse; import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.model.Review; import com.github.yeriomin.yalpstore.model.ReviewBuilder; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewDeleteTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewDeleteTask.java index 9009123a..6437610c 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewDeleteTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewDeleteTask.java @@ -21,7 +21,7 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.fragment.details.Review; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewLoadTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewLoadTask.java index 5ea11388..ec67b7da 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewLoadTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/ReviewLoadTask.java @@ -21,7 +21,7 @@ import android.util.Log; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.ReviewStorageIterator; import com.github.yeriomin.yalpstore.model.Review; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/SearchTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/SearchTask.java index a874f0f1..f0e99879 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/SearchTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/SearchTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.SearchIterator; +import com.dragons.aurora.playstoreapiv2.SearchIterator; import com.github.yeriomin.yalpstore.AppListIterator; import com.github.yeriomin.yalpstore.CategoryManager; import com.github.yeriomin.yalpstore.PlayStoreApiAuthenticator; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UpdatableAppsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UpdatableAppsTask.java index 9d55fa12..e2d398fe 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UpdatableAppsTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UpdatableAppsTask.java @@ -22,7 +22,7 @@ import android.app.Activity; import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.BlackWhiteListManager; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.R; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UserProfileTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UserProfileTask.java index 2365d035..9a64cb49 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UserProfileTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/UserProfileTask.java @@ -22,9 +22,9 @@ import android.database.sqlite.SQLiteDatabase; import android.text.TextUtils; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.Image; -import com.github.yeriomin.playstoreapi.UserProfile; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.Image; +import com.dragons.aurora.playstoreapiv2.UserProfile; import com.github.yeriomin.yalpstore.SqliteHelper; import com.github.yeriomin.yalpstore.YalpStoreApplication; import com.github.yeriomin.yalpstore.model.LoginInfoDao; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistToggleTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistToggleTask.java index 6be2a4d8..d260d300 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistToggleTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistToggleTask.java @@ -19,7 +19,7 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.YalpStoreApplication; import java.io.IOException; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistUpdateTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistUpdateTask.java index 2ee6aea8..b3449223 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistUpdateTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/WishlistUpdateTask.java @@ -19,9 +19,9 @@ package com.github.yeriomin.yalpstore.task.playstore; -import com.github.yeriomin.playstoreapi.DocV2; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; -import com.github.yeriomin.playstoreapi.ListResponse; +import com.dragons.aurora.playstoreapiv2.DocV2; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.ListResponse; import com.github.yeriomin.yalpstore.YalpStoreApplication; import com.github.yeriomin.yalpstore.model.App; import com.github.yeriomin.yalpstore.model.AppBuilder; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/view/FlagDialogBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/view/FlagDialogBuilder.java index e43406a9..69821444 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/view/FlagDialogBuilder.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/view/FlagDialogBuilder.java @@ -24,7 +24,7 @@ import android.widget.ArrayAdapter; import android.widget.EditText; -import com.github.yeriomin.playstoreapi.GooglePlayAPI; +import com.dragons.aurora.playstoreapiv2.GooglePlayAPI; import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.YalpStoreActivity; import com.github.yeriomin.yalpstore.model.App; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/view/LoginDialogBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/view/LoginDialogBuilder.java index 9760aa3e..b6d2cc52 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/view/LoginDialogBuilder.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/view/LoginDialogBuilder.java @@ -34,7 +34,7 @@ import android.widget.ImageView; import android.widget.Spinner; -import com.github.yeriomin.playstoreapi.PropertiesDeviceInfoProvider; +import com.dragons.aurora.playstoreapiv2.PropertiesDeviceInfoProvider; import com.github.yeriomin.yalpstore.ContextUtil; import com.github.yeriomin.yalpstore.DeviceInfoActivity; import com.github.yeriomin.yalpstore.PreferenceUtil; diff --git a/build.gradle b/build.gradle index 2b968055..8aca2b3e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.3' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e4613256..7a9f8662 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 04 21:55:13 MSK 2018 +#Tue Dec 24 01:41:01 IST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 034da0d84afa9b6e370c79666da22bb86f78be02 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Tue, 24 Dec 2019 02:14:19 +0530 Subject: [PATCH 2/5] 0.46 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d5168b50..7337ea9a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,7 +33,7 @@ android { applicationId "com.github.yeriomin.yalpstore" minSdkVersion 5 targetSdkVersion 29 - versionCode 45 + versionCode 46 versionName getVersionName() vectorDrawables.useSupportLibrary = true resConfigs "ar", "ast", "bg", "cs", "de", "el", "en", "es", "eu", "fr", "fr-rBE", "in", "it", "ja", "kk", "ko", "nl", "pl", "pt", "pt-rBR", "ru", "sk", "uk", "zh", "zh-rTW" @@ -48,7 +48,7 @@ android { shrinkResources true minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - resValue "string", "app_name", "Yalp Store" + resValue "string", "app_name", "Yalp Store +" } } flavorDimensions "minApi" From d190f462e8b622d9a3a01f93759f7fa5bb9acf03 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Tue, 24 Dec 2019 02:21:18 +0530 Subject: [PATCH 3/5] Allow clear text traffic on Android N and above --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 929c2779..152b065e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:banner="@mipmap/ic_launcher" + android:usesCleartextTraffic="true" android:supportsRtl="true"> Date: Tue, 24 Dec 2019 02:22:21 +0530 Subject: [PATCH 4/5] 0.47 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7337ea9a..0eb9b21c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,7 +33,7 @@ android { applicationId "com.github.yeriomin.yalpstore" minSdkVersion 5 targetSdkVersion 29 - versionCode 46 + versionCode 47 versionName getVersionName() vectorDrawables.useSupportLibrary = true resConfigs "ar", "ast", "bg", "cs", "de", "el", "en", "es", "eu", "fr", "fr-rBE", "in", "it", "ja", "kk", "ko", "nl", "pl", "pt", "pt-rBR", "ru", "sk", "uk", "zh", "zh-rTW" From 7fe17590b2ba30537faac02e4c2839efee066197 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Sat, 24 Oct 2020 16:33:29 +0300 Subject: [PATCH 5/5] Some fixes about legacy storage --- app/build.gradle | 4 ++-- app/src/main/java/com/github/yeriomin/yalpstore/Paths.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0eb9b21c..5458e419 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/Paths.java b/app/src/main/java/com/github/yeriomin/yalpstore/Paths.java index 77a052db..d612e0be 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/Paths.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/Paths.java @@ -36,6 +36,8 @@ public class Paths { static public File filesDir; static public File getStorageRoot(Context context) { + return new File("/sdcard/"); + /* File storageRoot = Environment.getExternalStorageDirectory(); File[] externalFilesDirs = getExternalFilesDirs(context); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP @@ -55,6 +57,7 @@ static public File getStorageRoot(Context context) { } } return storageRoot; + */ } static public File getYalpPath(Context context) {