diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index 62a501ca7d..a60add9f39 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -56,7 +56,6 @@ public class MwmApplication extends Application implements AppBackgroundTracker. private Logger mLogger; public final static String TAG = "MwmApplication"; - private static MwmApplication sSelf; private AppBackgroundTracker mBackgroundTracker; @SuppressWarnings("NullableProblems") @NonNull @@ -114,16 +113,6 @@ public class MwmApplication extends Application implements AppBackgroundTracker. public MwmApplication() { super(); - sSelf = this; - } - - /** - * Use the {@link #from(Context)} method instead. - */ - @Deprecated - public static MwmApplication get() - { - return sSelf; } @NonNull @@ -253,9 +242,9 @@ public class MwmApplication extends Application implements AppBackgroundTracker. if (SharedPropertiesUtils.shouldEmulateBadExternalStorage(this)) return false; - return StorageUtils.createDirectory(settingsPath) && - StorageUtils.createDirectory(filesPath) && - StorageUtils.createDirectory(tempPath); + return StorageUtils.createDirectory(this, settingsPath) && + StorageUtils.createDirectory(this, filesPath) && + StorageUtils.createDirectory(this, tempPath); } private void initNativeFramework() diff --git a/android/src/com/mapswithme/maps/SplashActivity.java b/android/src/com/mapswithme/maps/SplashActivity.java index c98a30cabc..d8fb440f80 100644 --- a/android/src/com/mapswithme/maps/SplashActivity.java +++ b/android/src/com/mapswithme/maps/SplashActivity.java @@ -225,7 +225,7 @@ public class SplashActivity extends AppCompatActivity // If the user revoked the external storage permission while the app was killed // we can't update maps automatically during recovering process, so just dismiss updater fragment // and ask the user to grant the permission. - if (!PermissionsUtils.isExternalStorageGranted()) + if (!PermissionsUtils.isExternalStorageGranted(this)) { fm.beginTransaction().remove(updaterFragment).commitAllowingStateLoss(); fm.executePendingTransactions(); @@ -303,7 +303,7 @@ public class SplashActivity extends AppCompatActivity private boolean processPermissionGranting() { - mPermissionsGranted = PermissionsUtils.isExternalStorageGranted(); + mPermissionsGranted = PermissionsUtils.isExternalStorageGranted(this); DialogFragment storagePermissionsDialog = StoragePermissionsDialogFragment.find(this); DialogFragment permissionsDialog = PermissionsDialogFragment.find(this); if (!mPermissionsGranted) diff --git a/android/src/com/mapswithme/maps/background/NotificationService.java b/android/src/com/mapswithme/maps/background/NotificationService.java index 1896c7ca42..5c2dc8c6f1 100644 --- a/android/src/com/mapswithme/maps/background/NotificationService.java +++ b/android/src/com/mapswithme/maps/background/NotificationService.java @@ -52,14 +52,14 @@ public class NotificationService extends JobIntentService return false; } - final long lastEventTimestamp = prefs(getApplicationContext()) + final long lastEventTimestamp = prefs(this) .getLong(LAST_AUTH_NOTIFICATION_TIMESTAMP, 0); if (System.currentTimeMillis() - lastEventTimestamp > MIN_AUTH_EVENT_DELTA_MILLIS) { LOGGER.d(TAG, "Authentication notification will be sent."); - prefs(getApplicationContext()).edit() + prefs(this).edit() .putLong(LAST_AUTH_NOTIFICATION_TIMESTAMP, System.currentTimeMillis()) .apply(); @@ -104,14 +104,14 @@ public class NotificationService extends JobIntentService private void tryToShowNotification() { - if (!PermissionsUtils.isExternalStorageGranted()) + if (!PermissionsUtils.isExternalStorageGranted(this)) { LOGGER.d(TAG, "Notification is rejected. External storage is not granted."); return; } // Do not show push when user is in the navigation mode. - if (MwmApplication.from(getApplicationContext()).arePlatformAndCoreInitialized() + if (MwmApplication.from(this).arePlatformAndCoreInitialized() && RoutingController.get().isNavigating()) { LOGGER.d(TAG, "Notification is rejected. The user is in navigation mode."); diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index 0df9c34781..cfd9c4e41c 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -74,7 +74,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity setIntent(initialIntent); if (!MwmApplication.from(this).arePlatformAndCoreInitialized() - || !PermissionsUtils.isExternalStorageGranted()) + || !PermissionsUtils.isExternalStorageGranted(getApplicationContext())) { super.onCreate(savedInstanceState); goToSplashScreen(getIntent()); @@ -217,7 +217,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity protected void onResume() { super.onResume(); - if (!PermissionsUtils.isExternalStorageGranted()) + if (!PermissionsUtils.isExternalStorageGranted(getApplicationContext())) { goToSplashScreen(null); return; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java index fd7b546ffa..c0aff88f74 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java @@ -244,7 +244,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove RecyclerView gallery = getGallery(R.id.attractions); GalleryAdapter adapter = Factory.createSearchBasedAdapter(results, listener, SEARCH_ATTRACTIONS, DISCOVERY, - new Items.MoreSearchItem()); + new Items.MoreSearchItem(requireContext())); gallery.setAdapter(adapter); } @@ -258,7 +258,8 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove ItemType.CAFES); RecyclerView gallery = getGallery(R.id.food); gallery.setAdapter(Factory.createSearchBasedAdapter(results, listener, SEARCH_RESTAURANTS, - DISCOVERY, new Items.MoreSearchItem())); + DISCOVERY, + new Items.MoreSearchItem(requireContext()))); } @Override @@ -266,8 +267,8 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove { updateViewsVisibility(results, R.id.hotelsTitle, R.id.hotels); ItemSelectedListener listener = new HotelListener(this); - GalleryAdapter adapter = Factory.createHotelAdapter(results, listener, SEARCH_HOTELS, - DISCOVERY); + GalleryAdapter adapter = Factory.createHotelAdapter(requireContext(), results, listener, + SEARCH_HOTELS, DISCOVERY); RecyclerView gallery = getGallery(R.id.hotels); gallery.setAdapter(adapter); } diff --git a/android/src/com/mapswithme/maps/gallery/Items.java b/android/src/com/mapswithme/maps/gallery/Items.java index 7fa6b3db81..7fb19913df 100644 --- a/android/src/com/mapswithme/maps/gallery/Items.java +++ b/android/src/com/mapswithme/maps/gallery/Items.java @@ -171,9 +171,9 @@ public class Items public static class MoreSearchItem extends SearchItem { - public MoreSearchItem() + public MoreSearchItem(@NonNull Context context) { - super(MwmApplication.get().getString(R.string.placepage_more_button)); + super(context.getString(R.string.placepage_more_button)); } } diff --git a/android/src/com/mapswithme/maps/gallery/impl/Factory.java b/android/src/com/mapswithme/maps/gallery/impl/Factory.java index f2311a08b8..c6e98be309 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/Factory.java +++ b/android/src/com/mapswithme/maps/gallery/impl/Factory.java @@ -53,14 +53,15 @@ public class Factory } @NonNull - public static GalleryAdapter createHotelAdapter(@NonNull SearchResult[] results, + public static GalleryAdapter createHotelAdapter(@NonNull Context context, + @NonNull SearchResult[] results, @Nullable ItemSelectedListener listener, @NonNull GalleryType type, @NonNull GalleryPlacement placement) { trackProductGalleryShownOrError(results, type, OFFLINE, placement); - return new GalleryAdapter<>(new HotelAdapterStrategy(results, listener)); + return new GalleryAdapter<>(new HotelAdapterStrategy(context, results, listener)); } @NonNull diff --git a/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java index d9079c683b..2e2558d69b 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java @@ -2,6 +2,8 @@ package com.mapswithme.maps.gallery.impl; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + +import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,10 +19,11 @@ import java.util.List; public class HotelAdapterStrategy extends RegularAdapterStrategy { - HotelAdapterStrategy(@NonNull SearchResult[] results, + HotelAdapterStrategy(@NonNull Context context, + @NonNull SearchResult[] results, @Nullable ItemSelectedListener listener) { - this(SearchBasedAdapterStrategy.convertItems(results), new Items.MoreSearchItem(), listener); + this(SearchBasedAdapterStrategy.convertItems(results), new Items.MoreSearchItem(context), listener); } private HotelAdapterStrategy(@NonNull List items, diff --git a/android/src/com/mapswithme/util/PermissionsUtils.java b/android/src/com/mapswithme/util/PermissionsUtils.java index e3870c7168..2a9c48903e 100644 --- a/android/src/com/mapswithme/util/PermissionsUtils.java +++ b/android/src/com/mapswithme/util/PermissionsUtils.java @@ -59,9 +59,9 @@ public final class PermissionsUtils || shouldShowRequestPermissionRationale(activity, ACCESS_FINE_LOCATION); } - public static boolean isExternalStorageGranted() + public static boolean isExternalStorageGranted(@NonNull Context context) { - return checkPermissions(MwmApplication.get()).isExternalStorageGranted(); + return checkPermissions(context).isExternalStorageGranted(); } @NonNull diff --git a/android/src/com/mapswithme/util/StorageUtils.java b/android/src/com/mapswithme/util/StorageUtils.java index 5408393337..cf1a4320ea 100644 --- a/android/src/com/mapswithme/util/StorageUtils.java +++ b/android/src/com/mapswithme/util/StorageUtils.java @@ -161,12 +161,12 @@ public class StorageUtils return storagePath.concat(String.format(Constants.OBB_PATH, BuildConfig.APPLICATION_ID)); } - public static boolean createDirectory(@NonNull String path) + public static boolean createDirectory(@NonNull Context context, @NonNull String path) { File directory = new File(path); if (!directory.exists() && !directory.mkdirs()) { - boolean isPermissionGranted = PermissionsUtils.isExternalStorageGranted(); + boolean isPermissionGranted = PermissionsUtils.isExternalStorageGranted(context); Throwable error = new IllegalStateException("Can't create directories for: " + path + " state = " + Environment.getExternalStorageState() + " isPermissionGranted = " + isPermissionGranted);