[APP-2876] Remove MIUI Rules regarding app bundles

Aptoide · Sep 11, 2024 · 8ceac90 · 8ceac90
1 parent a79c9d0
commit 8ceac90
Show file tree

Hide file tree

Showing 46 changed files with 158 additions and 557 deletions.
diff --git a/app/src/main/java/cm/aptoide/pt/ApplicationModule.java b/app/src/main/java/cm/aptoide/pt/ApplicationModule.java
@@ -130,8 +130,6 @@
 import cm.aptoide.pt.database.room.AptoideDatabase;
 import cm.aptoide.pt.dataprovider.NetworkOperatorManager;
 import cm.aptoide.pt.dataprovider.WebService;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilityManager;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilitySettingsProvider;
 import cm.aptoide.pt.dataprovider.ads.AdNetworkUtils;
 import cm.aptoide.pt.dataprovider.cache.L2Cache;
 import cm.aptoide.pt.dataprovider.cache.POSTCacheInterceptor;
@@ -193,7 +191,6 @@
 import cm.aptoide.pt.install.InstallManager;
 import cm.aptoide.pt.install.Installer;
 import cm.aptoide.pt.install.InstallerAnalytics;
-import cm.aptoide.pt.install.PackageInstallerManager;
 import cm.aptoide.pt.install.PackageRepository;
 import cm.aptoide.pt.install.RootInstallNotificationEventReceiver;
 import cm.aptoide.pt.install.RootInstallerProvider;
@@ -388,12 +385,12 @@ public ApplicationModule(AptoideApplication application) {
       @Named("secureShared") SharedPreferences secureSharedPreferences,
       DownloadsRepository downloadsRepository,
       AptoideInstalledAppsRepository aptoideInstalledAppsRepository,
-      PackageInstallerManager packageInstallerManager, ForegroundManager foregroundManager,
+      ForegroundManager foregroundManager,
       AptoideInstallManager aptoideInstallManager, InstallAppSizeValidator installAppSizeValidator,
       FileManager fileManager) {
     return new InstallManager(application, aptoideDownloadManager, defaultInstaller,
         rootAvailabilityManager, defaultSharedPreferences, secureSharedPreferences,
-        downloadsRepository, aptoideInstalledAppsRepository, packageInstallerManager,
+        downloadsRepository, aptoideInstalledAppsRepository,
         foregroundManager, aptoideInstallManager, installAppSizeValidator, fileManager);
   }
 
@@ -1220,10 +1217,9 @@ BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v3.BaseBody> providesBodyIntercept
       @Named("default") SharedPreferences sharedPreferences, TokenInvalidator tokenInvalidator,
       Converter.Factory converterFactory, @Named("default") OkHttpClient httpClient,
       @Named("mature-pool-v7")
-      BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> bodyInterceptor,
-      AppBundlesVisibilityManager appBundlesVisibilityManager) {
+      BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> bodyInterceptor) {
     return new TrendingService(storeCredentialsProvider, bodyInterceptor, httpClient,
-        converterFactory, tokenInvalidator, sharedPreferences, appBundlesVisibilityManager);
+        converterFactory, tokenInvalidator, sharedPreferences);
   }
 
   @Singleton @Provides @Named("ws-prod-suggestions-base-url") String provideSearchBaseUrl(
@@ -1449,9 +1445,9 @@ Retrofit providesLoadTopReactionsRetrofit(@Named("reactions-host") String baseHo
   BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> bodyInterceptorPoolV7,
       @Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
       Converter.Factory converterFactory, @Named("default") SharedPreferences sharedPreferences,
-      SplitsMapper splitsMapper, AppBundlesVisibilityManager appBundlesVisibilityManager) {
+      SplitsMapper splitsMapper) {
     return new PromotionsService(bodyInterceptorPoolV7, okHttpClient, tokenInvalidator,
-        converterFactory, sharedPreferences, splitsMapper, appBundlesVisibilityManager);
+        converterFactory, sharedPreferences, splitsMapper);
   }
 
   @Singleton @Provides CrashReport providesCrashReports() {
@@ -1611,24 +1607,10 @@ AnalyticsEventParametersNormalizer providesAnalyticsNormalizer() {
       StoreCredentialsProvider storeCredentialsProvider, @Named("mature-pool-v7")
   BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> bodyInterceptorPoolV7,
       @Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
-      @Named("default") SharedPreferences sharedPreferences, SplitsMapper splitsMapper,
-      AppBundlesVisibilityManager appBundlesVisibilityManager) {
+      @Named("default") SharedPreferences sharedPreferences, SplitsMapper splitsMapper) {
 
     return new AppService(storeCredentialsProvider, bodyInterceptorPoolV7, okHttpClient,
-        WebService.getDefaultConverter(), tokenInvalidator, sharedPreferences, splitsMapper,
-        appBundlesVisibilityManager);
-  }
-
-  @Singleton @Provides AppBundlesVisibilityManager providesAppBundlesVisibilityManager(
-      AppBundlesVisibilitySettingsProvider AppBundlesVisibilitySettingsProvider) {
-    return new AppBundlesVisibilityManager(AptoideUtils.isMIUIwithAABFix(),
-        AptoideUtils.isDeviceMIUI(), AppBundlesVisibilitySettingsProvider);
-  }
-
-  @Singleton @Provides
-  AppBundlesVisibilitySettingsProvider providesAppBundlesVisibilitySettingsProvider(
-      @Named("default") SharedPreferences sharedPreferences) {
-    return new AppBundlesVisibilitySettingsProvider(sharedPreferences);
+        WebService.getDefaultConverter(), tokenInvalidator, sharedPreferences, splitsMapper);
   }
 
   @Singleton @Provides AppCenterRepository providesAppCenterRepository(AppService appService) {
@@ -1652,10 +1634,9 @@ AppBundlesVisibilitySettingsProvider providesAppBundlesVisibilitySettingsProvide
   @Singleton @Provides AppCoinsService providesAppCoinsService(@Named("mature-pool-v7")
   BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> bodyInterceptorPoolV7,
       @Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
-      @Named("default") SharedPreferences sharedPreferences, Converter.Factory converterFactory,
-      AppBundlesVisibilityManager appBundlesVisibilityManager) {
+      @Named("default") SharedPreferences sharedPreferences, Converter.Factory converterFactory) {
     return new AppCoinsService(okHttpClient, tokenInvalidator, sharedPreferences,
-        bodyInterceptorPoolV7, converterFactory, appBundlesVisibilityManager);
+        bodyInterceptorPoolV7, converterFactory);
   }
 
   @Named("remote") @Singleton @Provides BundleDataSource providesRemoteBundleDataSource(
@@ -1667,16 +1648,16 @@ AppBundlesVisibilitySettingsProvider providesAppBundlesVisibilitySettingsProvide
       PackageRepository packageRepository, IdsRepository idsRepository, QManager qManager,
       Resources resources, WindowManager windowManager, ConnectivityManager connectivityManager,
       AdsApplicationVersionCodeProvider adsApplicationVersionCodeProvider,
-      OemidProvider oemidProvider, AppBundlesVisibilityManager appBundlesVisibilityManager,
-      StoreCredentialsProvider storeCredentialsProvider, AppCoinsManager appCoinsManager) {
+      OemidProvider oemidProvider, StoreCredentialsProvider storeCredentialsProvider,
+      AppCoinsManager appCoinsManager) {
     return new RemoteBundleDataSource(5, new HashMap<>(), bodyInterceptorPoolV7, okHttpClient,
         converter, mapper, tokenInvalidator, sharedPreferences, new WSWidgetsUtils(),
         storeCredentialsProvider, idsRepository,
         AdNetworkUtils.isGooglePlayServicesAvailable(application.getApplicationContext()),
         oemidProvider.getOemid(), accountManager,
         qManager.getFilters(ManagerPreferences.getHWSpecsFilter(sharedPreferences)), resources,
         windowManager, connectivityManager, adsApplicationVersionCodeProvider, packageRepository,
-        10, 10, appBundlesVisibilityManager, appCoinsManager);
+        10, 10, appCoinsManager);
   }
 
   @Singleton @Provides StorePersistence providesStorePersistence(AptoideDatabase aptoideDatabase) {
@@ -1744,11 +1725,11 @@ AppComingSoonRegistrationPersistence providesAppComingSoonRegistrationPersistenc
   BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> bodyInterceptorPoolV7,
       @Named("default") OkHttpClient okHttpClient, Converter.Factory converterFactory,
       TokenInvalidator tokenInvalidator, @Named("default") SharedPreferences sharedPreferences,
-      AppBundlesVisibilityManager appBundlesVisibilityManager, UpdateMapper updateMapper,
+      UpdateMapper updateMapper,
       AptoideInstalledAppsRepository aptoideInstalledAppsRepository) {
     return new UpdateRepository(updatePersistence, storeRepository, idsRepository,
         bodyInterceptorPoolV7, okHttpClient, converterFactory, tokenInvalidator, sharedPreferences,
-        appBundlesVisibilityManager, updateMapper, aptoideInstalledAppsRepository);
+        updateMapper, aptoideInstalledAppsRepository);
   }
 
   @Singleton @Provides UpdateMapper providesUpdateMapper() {
@@ -1964,7 +1945,6 @@ List<String> provideDefaultFollowedStores() {
         PromotionsAnalytics.VALENTINE_MIGRATOR, AppViewAnalytics.ADS_BLOCK_BY_OFFER,
         AppViewAnalytics.APPC_SIMILAR_APP_INTERACT, AppViewAnalytics.BONUS_MIGRATION_APPVIEW,
         AppViewAnalytics.BONUS_GAME_WALLET_OFFER_19, DeepLinkAnalytics.APPCOINS_WALLET_DEEPLINK,
-        InstallEvents.MIUI_INSTALLATION_ABOVE_20_EVENT_NAME,
         AptoideApplicationAnalytics.IS_ANDROID_TV, ThemeAnalytics.DARK_THEME_INTERACT_EVENT,
         UserFeedbackAnalytics.USER_FEEDBACK_EVENT_NAME,
         InstallEvents.IS_INSTALLATION_TYPE_EVENT_NAME,
@@ -2008,7 +1988,6 @@ List<String> provideDefaultFollowedStores() {
         PromotionsAnalytics.VALENTINE_MIGRATOR, AppViewAnalytics.ADS_BLOCK_BY_OFFER,
         AppViewAnalytics.APPC_SIMILAR_APP_INTERACT, AppViewAnalytics.BONUS_MIGRATION_APPVIEW,
         AppViewAnalytics.BONUS_GAME_WALLET_OFFER_19, DeepLinkAnalytics.APPCOINS_WALLET_DEEPLINK,
-        InstallEvents.MIUI_INSTALLATION_ABOVE_20_EVENT_NAME,
         AptoideApplicationAnalytics.IS_ANDROID_TV, ThemeAnalytics.DARK_THEME_INTERACT_EVENT,
         UserFeedbackAnalytics.USER_FEEDBACK_EVENT_NAME,
         InstallEvents.IS_INSTALLATION_TYPE_EVENT_NAME,
@@ -2087,11 +2066,6 @@ List<String> provideDefaultFollowedStores() {
     return new AppInstallerStatusReceiver(PublishSubject.create());
   }
 
-  @Singleton @Provides PackageInstallerManager providesPackageInstallerManager() {
-    return new PackageInstallerManager(AptoideUtils.isDeviceMIUI(),
-        AptoideUtils.isMIUIwithAABFix());
-  }
-
   @Singleton @Provides NotificationProvider provideNotificationProvider(
       RoomNotificationPersistence notificationPersistence) {
     return new NotificationProvider(notificationPersistence, Schedulers.io());
@@ -2223,9 +2197,9 @@ RoomLocalNotificationSyncPersistence providesRoomLocalNotificationSyncPersistenc
   BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v7.BaseBody> baseBodyBodyInterceptor,
       @Named("default") SharedPreferences sharedPreferences, TokenInvalidator tokenInvalidator,
       @Named("default") OkHttpClient okHttpClient, Converter.Factory converterFactory,
-      AppBundlesVisibilityManager appBundlesVisibilityManager, OemidProvider oemidProvider) {
+      OemidProvider oemidProvider) {
     return new SearchRepository(roomStoreRepository, baseBodyBodyInterceptor, okHttpClient,
-        converterFactory, tokenInvalidator, sharedPreferences, appBundlesVisibilityManager,
+        converterFactory, tokenInvalidator, sharedPreferences,
         oemidProvider);
   }
 

diff --git a/app/src/main/java/cm/aptoide/pt/DeepLinkIntentReceiver.java b/app/src/main/java/cm/aptoide/pt/DeepLinkIntentReceiver.java
@@ -17,8 +17,6 @@
 import cm.aptoide.analytics.implementation.navigation.NavigationTracker;
 import cm.aptoide.pt.crashreports.CrashReport;
 import cm.aptoide.pt.dataprovider.WebService;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilityManager;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilitySettingsProvider;
 import cm.aptoide.pt.dataprovider.exception.AptoideWsV7Exception;
 import cm.aptoide.pt.dataprovider.exception.NoNetworkConnectionException;
 import cm.aptoide.pt.dataprovider.model.v7.GetApp;
@@ -486,14 +484,11 @@ public Intent startFromPackageName(String packageName) {
       try {
 
         app = GetAppRequest.of(packageName,
-            ((AptoideApplication) getApplicationContext()).getAccountSettingsBodyInterceptorPoolV7(),
-            ((AptoideApplication) getApplicationContext()).getDefaultClient(),
-            WebService.getDefaultConverter(),
-            ((AptoideApplication) getApplicationContext()).getTokenInvalidator(),
-            ((AptoideApplication) getApplicationContext()).getDefaultSharedPreferences(),
-            new AppBundlesVisibilityManager(AptoideUtils.isMIUIwithAABFix(),
-                AptoideUtils.isDeviceMIUI(), new AppBundlesVisibilitySettingsProvider(
-                ((AptoideApplication) getApplicationContext()).getDefaultSharedPreferences())))
+                ((AptoideApplication) getApplicationContext()).getAccountSettingsBodyInterceptorPoolV7(),
+                ((AptoideApplication) getApplicationContext()).getDefaultClient(),
+                WebService.getDefaultConverter(),
+                ((AptoideApplication) getApplicationContext()).getTokenInvalidator(),
+                ((AptoideApplication) getApplicationContext()).getDefaultSharedPreferences())
             .observe()
             .toBlocking()
             .first();

diff --git a/app/src/main/java/cm/aptoide/pt/app/AppCoinsService.java b/app/src/main/java/cm/aptoide/pt/app/AppCoinsService.java
@@ -1,7 +1,6 @@
 package cm.aptoide.pt.app;
 
 import android.content.SharedPreferences;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilityManager;
 import cm.aptoide.pt.dataprovider.interfaces.TokenInvalidator;
 import cm.aptoide.pt.dataprovider.model.v7.AppCoinsCampaign;
 import cm.aptoide.pt.dataprovider.model.v7.ListAppCoinsCampaigns;
@@ -19,24 +18,21 @@ public class AppCoinsService {
   private final SharedPreferences preferences;
   private final BodyInterceptor<BaseBody> bodyInterceptor;
   private final Converter.Factory converterFactory;
-  private final AppBundlesVisibilityManager appBundlesVisibilityManager;
 
   public AppCoinsService(OkHttpClient httpClient, TokenInvalidator tokenInvalidator,
       SharedPreferences preferences, BodyInterceptor<BaseBody> bodyInterceptor,
-      Converter.Factory converterFactory, AppBundlesVisibilityManager appBundlesVisibilityManager) {
+      Converter.Factory converterFactory) {
     this.httpClient = httpClient;
     this.tokenInvalidator = tokenInvalidator;
     this.preferences = preferences;
     this.bodyInterceptor = bodyInterceptor;
     this.converterFactory = converterFactory;
-    this.appBundlesVisibilityManager = appBundlesVisibilityManager;
   }
 
   public Single<AppCoinsAdvertisingModel> getValidCampaign(String packageName, int versionCode) {
     return new GetAppCoinsCampaignsRequest(
         new GetAppCoinsCampaignsRequest.Body(packageName, versionCode), httpClient,
-        converterFactory, bodyInterceptor, tokenInvalidator, preferences,
-        appBundlesVisibilityManager).observe()
+        converterFactory, bodyInterceptor, tokenInvalidator, preferences).observe()
         .toSingle()
         .map(listAppCoinsCampaigns -> mapAdvertising(listAppCoinsCampaigns));
   }

diff --git a/app/src/main/java/cm/aptoide/pt/app/view/OtherVersionsFragment.java b/app/src/main/java/cm/aptoide/pt/app/view/OtherVersionsFragment.java
@@ -16,8 +16,6 @@
 import cm.aptoide.pt.R;
 import cm.aptoide.pt.app.view.displayable.OtherVersionDisplayable;
 import cm.aptoide.pt.dataprovider.WebService;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilityManager;
-import cm.aptoide.pt.dataprovider.aab.AppBundlesVisibilitySettingsProvider;
 import cm.aptoide.pt.dataprovider.interfaces.SuccessRequestListener;
 import cm.aptoide.pt.dataprovider.model.v7.listapp.App;
 import cm.aptoide.pt.dataprovider.model.v7.listapp.ListAppVersions;
@@ -153,10 +151,7 @@ protected void fetchOtherVersions() {
             baseBodyInterceptor, httpClient, converterFactory,
             ((AptoideApplication) getContext().getApplicationContext()).getTokenInvalidator(),
             ((AptoideApplication) getContext().getApplicationContext()).getDefaultSharedPreferences(),
-            getContext().getResources(),
-            new AppBundlesVisibilityManager(AptoideUtils.isMIUIwithAABFix(),
-                AptoideUtils.isDeviceMIUI(), new AppBundlesVisibilitySettingsProvider(
-                ((AptoideApplication) getContext().getApplicationContext()).getDefaultSharedPreferences()))),
+            getContext().getResources()),
         otherVersionsSuccessRequestListener, err -> err.printStackTrace());
 
     getRecyclerView().addOnScrollListener(endlessRecyclerOnScrollListener);

diff --git a/app/src/main/java/cm/aptoide/pt/download/DownloadAnalytics.java b/app/src/main/java/cm/aptoide/pt/download/DownloadAnalytics.java
@@ -437,7 +437,6 @@ private HashMap<String, Object> createRakamDownloadEvent(String packageName, int
     result.put(APP_AAB, isAppBundle);
     result.put(APP_OBB, hasObbs);
     result.put(IS_APKFY, isApkfy);
-    result.put(MIUI_AAB_FIX, AptoideUtils.getMIUITimestamp());
     result.put(APP_AAB_INSTALL_TIME, splitTypes);
     result.put(APP_IN_CATAPPULT, isInCatappult);
     if (!appCategory.isEmpty()) {