AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] remove MwmApplication get

Browse source
This commit is contained in:
Alexey Osminin 2020-12-07 12:40:08 +03:00 • committed by Aleksandr Zatsepin
parent 2bb578bdcc
commit 7abe2833fd
12 changed files with 51 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -70,8 +70,12 @@ std::string Platform::GetMemoryInfo() const
static std::shared_ptr<jobject> classMemLogging = jni::make_global_ref(env->FindClass("com/mapswithme/util/log/MemLogging"));
ASSERT(classMemLogging, ());
static jmethodID const getMemoryInfoId = jni::GetStaticMethodID(env, static_cast<jclass>(*classMemLogging), "getMemoryInfo", "()Ljava/lang/String;");
jstring const memInfoString = (jstring)env->CallStaticObjectMethod(static_cast<jclass>(*classMemLogging), getMemoryInfoId);
jobject context = android::Platform::Instance().GetContext();
static jmethodID const getMemoryInfoId = jni::GetStaticMethodID(env,
static_cast<jclass>(*classMemLogging), "getMemoryInfo",
"(Landroid/content/Context;)Ljava/lang/String;");
jstring const memInfoString = (jstring)env->CallStaticObjectMethod(
static_cast<jclass>(*classMemLogging), getMemoryInfoId, context);
ASSERT(memInfoString, ());
return jni::ToNativeString(env, memInfoString);

4
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -738,7 +738,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
// results are no longer needed.
SearchEngine.INSTANCE.cancel();
SearchEngine.INSTANCE.searchInteractive(mSearchController.getQuery(), System.nanoTime(),
SearchEngine.INSTANCE.searchInteractive(this, mSearchController.getQuery(), System.nanoTime(),
false /* isMapAndTable */,
mFilterController != null ? mFilterController.getFilter() : null,
mFilterController != null ? mFilterController.getBookingFilterParams() : null);
@ -1745,7 +1745,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
return;
request.setPointData(object.getLat(), object.getLon(), object.getTitle(), object.getApiId());
object.setSubtitle(request.getCallerName(MwmApplication.get()).toString());
object.setSubtitle(request.getCallerName(MwmApplication.from(this)).toString());
}
}

2
android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
View file

@ -75,7 +75,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
{
mSearchRunning = true;
mCurrentSearch = System.nanoTime();
SearchEngine.searchMaps(mToolbarController.getQuery(), mCurrentSearch);
SearchEngine.searchMaps(requireContext(), mToolbarController.getQuery(), mCurrentSearch);
mToolbarController.showProgress(true);
if (mAdapter != null)
mAdapter.clearAdsAndCancelMyTarget();

4
android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -148,7 +148,7 @@ public enum LocationHelper implements Initializable<Context>
private final LocationState.LocationPendingTimeoutListener mLocationPendingTimeoutListener =
() -> {
stop();
if (LocationUtils.areLocationServicesTurnedOn())
if (LocationUtils.areLocationServicesTurnedOn(mContext))
notifyLocationNotFound();
};
@ -469,7 +469,7 @@ public enum LocationHelper implements Initializable<Context>
addListener(mCoreLocationListener, true);
if (!LocationUtils.checkProvidersAvailability())
if (!LocationUtils.checkProvidersAvailability(mContext))
{
// No need to notify about an error in first run mode
if (!mInFirstRun)

2
android/src/com/mapswithme/maps/routing/SearchWheel.java
View file

@ -296,7 +296,7 @@ class SearchWheel implements View.OnClickListener
{
mCurrentOption = searchOption;
final String query = mFrame.getContext().getString(searchOption.mQueryId);
SearchEngine.INSTANCE.searchInteractive(query, System.nanoTime(), false /* isMapAndTable */,
SearchEngine.INSTANCE.searchInteractive(mFrame.getContext(), query, System.nanoTime(), false /* isMapAndTable */,
null /* hotelsFilter */, null /* bookingParams */);
refreshSearchButtonImage();

24
android/src/com/mapswithme/maps/search/SearchEngine.java
View file

@ -1,5 +1,7 @@
package com.mapswithme.maps.search;
import android.content.Context;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -145,17 +147,19 @@ public enum SearchEngine implements NativeSearchListener,
private native void nativeInit();
/**
*
* @param context
* @param timestamp Search results are filtered according to it after multiple requests.
* @return whether search was actually started.
*/
@MainThread
public boolean search(String query, long timestamp, boolean hasLocation,
double lat, double lon, @Nullable HotelsFilter hotelsFilter,
@Nullable BookingFilterParams bookingParams)
public boolean search(@NonNull Context context, String query, long timestamp, boolean hasLocation,
double lat, double lon, @Nullable HotelsFilter hotelsFilter,
@Nullable BookingFilterParams bookingParams)
{
try
{
return nativeRunSearch(query.getBytes("utf-8"), Language.getKeyboardLocale(),
return nativeRunSearch(query.getBytes("utf-8"), Language.getKeyboardLocale(context),
timestamp, hasLocation, lat, lon, hotelsFilter, bookingParams);
} catch (UnsupportedEncodingException ignored) { }
@ -175,18 +179,20 @@ public enum SearchEngine implements NativeSearchListener,
}
@MainThread
public void searchInteractive(@NonNull String query, long timestamp, boolean isMapAndTable,
@Nullable HotelsFilter hotelsFilter, @Nullable BookingFilterParams bookingParams)
public void searchInteractive(@NonNull Context context, @NonNull String query, long timestamp,
boolean isMapAndTable, @Nullable HotelsFilter hotelsFilter,
@Nullable BookingFilterParams bookingParams)
{
searchInteractive(query, Language.getKeyboardLocale(), timestamp, isMapAndTable, hotelsFilter, bookingParams);
searchInteractive(query, Language.getKeyboardLocale(context), timestamp, isMapAndTable, hotelsFilter, bookingParams);
}
@MainThread
public static void searchMaps(String query, long timestamp)
public static void searchMaps(@NonNull Context context, String query, long timestamp)
{
try
{
nativeRunSearchMaps(query.getBytes("utf-8"), Language.getKeyboardLocale(), timestamp);
nativeRunSearchMaps(query.getBytes("utf-8"), Language.getKeyboardLocale(context),
timestamp);
} catch (UnsupportedEncodingException ignored) { }
}

10
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -538,7 +538,7 @@ public class SearchFragment extends BaseMwmFragment
void showSingleResultOnMap(@NonNull SearchResult result, int resultIndex)
{
final String query = getQuery();
SearchRecents.add(query);
SearchRecents.add(query, requireContext());
SearchEngine.INSTANCE.cancel();
if (!RoutingController.get().isWaitingPoiPick())
@ -556,7 +556,7 @@ public class SearchFragment extends BaseMwmFragment
SearchEngine.INSTANCE.cancel();
final String query = getQuery();
SearchRecents.add(query);
SearchRecents.add(query, requireContext());
mLastQueryTimestamp = System.nanoTime();
HotelsFilter hotelsFilter = null;
@ -569,7 +569,7 @@ public class SearchFragment extends BaseMwmFragment
SearchEngine.INSTANCE.searchInteractive(
query, !TextUtils.isEmpty(mInitialLocale)
? mInitialLocale : com.mapswithme.util.Language.getKeyboardLocale(),
? mInitialLocale : com.mapswithme.util.Language.getKeyboardLocale(requireContext()),
mLastQueryTimestamp, false /* isMapAndTable */,
hotelsFilter, bookingFilterParams);
SearchEngine.INSTANCE.setQuery(query);
@ -621,12 +621,12 @@ public class SearchFragment extends BaseMwmFragment
mLastQueryTimestamp = System.nanoTime();
if (isTabletSearch())
{
SearchEngine.INSTANCE.searchInteractive(getQuery(), mLastQueryTimestamp, true /* isMapAndTable */,
SearchEngine.INSTANCE.searchInteractive(requireContext(), getQuery(), mLastQueryTimestamp, true /* isMapAndTable */,
hotelsFilter, bookingFilterParams);
}
else
{
if (!SearchEngine.INSTANCE.search(getQuery(), mLastQueryTimestamp, mLastPosition.valid,
if (!SearchEngine.INSTANCE.search(requireContext(), getQuery(), mLastQueryTimestamp, mLastPosition.valid,
mLastPosition.lat, mLastPosition.lon,
hotelsFilter, bookingFilterParams))
{

6
android/src/com/mapswithme/maps/search/SearchRecents.java
View file

@ -1,6 +1,8 @@
package com.mapswithme.maps.search;
import androidx.annotation.NonNull;
import android.content.Context;
import android.text.TextUtils;
import android.util.Pair;
import com.mapswithme.util.Language;
@ -34,12 +36,12 @@ public final class SearchRecents
return sRecents.get(position);
}
public static boolean add(@NonNull String query)
public static boolean add(@NonNull String query, @NonNull Context context)
{
if (TextUtils.isEmpty(query) || sRecents.contains(query))
return false;
nativeAdd(Language.getKeyboardLocale(), query);
nativeAdd(Language.getKeyboardLocale(context), query);
refresh();
return true;
}

2
android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java
View file

@ -191,7 +191,7 @@ public class UGCEditorFragment extends BaseToolbarAuthFragment
modifiedRatings.toArray(ratings);
UGCUpdate update = new UGCUpdate(ratings, mReviewEditText.getText().toString(),
System.currentTimeMillis(), Language.getDefaultLocale(),
Language.getKeyboardLocale());
Language.getKeyboardLocale(requireContext()));
FeatureId featureId = getArguments().getParcelable(ARG_FEATURE_ID);
if (featureId == null)
{

4
android/src/com/mapswithme/util/Language.java
View file

@ -6,6 +6,7 @@ import android.text.TextUtils;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
import androidx.annotation.Nullable;
import com.mapswithme.maps.MwmApplication;
import java.util.Locale;
@ -35,9 +36,8 @@ public class Language
// After some testing on Galaxy S4, looks like this method doesn't work on all devices:
// sometime it always returns the same value as getDefaultLocale()
@NonNull
public static String getKeyboardLocale()
public static String getKeyboardLocale(@NonNull Context context)
{
Context context = MwmApplication.get();
InputMethodManager imm = (InputMethodManager) context
.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm == null)

25
android/src/com/mapswithme/util/LocationUtils.java
View file

@ -102,9 +102,9 @@ public class LocationUtils
@SuppressLint("InlinedApi")
@SuppressWarnings("deprecation")
public static boolean areLocationServicesTurnedOn()
public static boolean areLocationServicesTurnedOn(@NonNull Context context)
{
final ContentResolver resolver = MwmApplication.get().getContentResolver();
final ContentResolver resolver = context.getContentResolver();
try
{
return Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE)
@ -116,9 +116,9 @@ public class LocationUtils
}
}
private static void logAvailableProviders()
private static void logAvailableProviders(@NonNull Context context)
{
LocationManager locMngr = (LocationManager) MwmApplication.get().getSystemService(Context.LOCATION_SERVICE);
LocationManager locMngr = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
List<String> providers = locMngr.getProviders(true);
StringBuilder sb;
if (!providers.isEmpty())
@ -134,20 +134,9 @@ public class LocationUtils
LOGGER.i(TAG, sb.toString());
}
/**
*
* Use {@link #checkProvidersAvailability(Application)} instead.
*/
@SuppressWarnings("DeprecatedIsStillUsed")
@Deprecated
public static boolean checkProvidersAvailability()
public static boolean checkProvidersAvailability(@NonNull Context context)
{
return checkProvidersAvailability(MwmApplication.get());
}
public static boolean checkProvidersAvailability(@NonNull Application application)
{
LocationManager locationManager = (LocationManager) application.getSystemService(Context.LOCATION_SERVICE);
LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
if (locationManager == null)
{
LOGGER.e(TAG, "This device doesn't support the location service.");
@ -156,7 +145,7 @@ public class LocationUtils
boolean networkEnabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
boolean gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
LocationUtils.logAvailableProviders();
LocationUtils.logAvailableProviders(context);
return networkEnabled || gpsEnabled;
}
}

8
android/src/com/mapswithme/util/log/MemLogging.java
View file

@ -4,18 +4,20 @@ import android.app.ActivityManager;
import android.content.Context;
import android.os.Debug;
import android.os.Build;
import androidx.annotation.NonNull;
import com.mapswithme.maps.MwmApplication;
@SuppressWarnings("unused")
public class MemLogging
{
public static String getMemoryInfo()
public static String getMemoryInfo(@NonNull Context context)
{
final Debug.MemoryInfo debugMI = new Debug.MemoryInfo();
Debug.getMemoryInfo(debugMI);
final ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
final ActivityManager activityManager =
(ActivityManager) MwmApplication.get().getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
activityManager.getMemoryInfo(mi);
StringBuilder log = new StringBuilder("Memory info: ");