kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] ability for debugging webview

Browse source
This commit is contained in:
Alexey Osminin 2020-12-15 15:55:38 +03:00 • committed by Aleksandr Zatsepin
parent dd64f1f09a
commit 44eb20bd6f
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.Handler;
import android.os.Message;
import android.webkit.WebView;
import androidx.annotation.NonNull;
import androidx.multidex.MultiDex;
@ -42,6 +43,7 @@ import com.mapswithme.util.SharedPropertiesUtils;
import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import com.mapswithme.util.statistics.Statistics;
@ -172,6 +174,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
mPurchaseOperationObservable = new PurchaseOperationObservable();
mPlayer = new MediaPlayerWrapper(this);
mGeofenceRegistry = new GeofenceRegistryImpl(this);
WebView.setWebContentsDebuggingEnabled(Utils.isDebugOrBeta());
}
private void initNotificationChannels()

7
android/src/com/mapswithme/util/Utils.java
View file

@ -681,7 +681,7 @@ public class Utils
catch (RuntimeException e)
{
LOGGER.e(TAG, "Failed to get string with id '" + key + "'", e);
if (BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("beta"))
if (isDebugOrBeta())
{
Toast.makeText(context, "Add string id for '" + key + "'!",
Toast.LENGTH_LONG).show();
@ -690,6 +690,11 @@ public class Utils
return INVALID_ID;
}
public static boolean isDebugOrBeta()
{
return BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("beta");
}
/**
* Returns a string value for the specified key. If the value is not found then its key will be
* returned.