From 0a580324bf02ad077932b4648ce0aef5e7b01ab3 Mon Sep 17 00:00:00 2001
From: Chris Garrity <chrisg@media.mit.edu>
Date: Thu, 16 Jan 2020 08:49:59 -0500
Subject: [PATCH] FIx. debugging
---
android/ScratchJr/app/build.gradle | 3 ---
.../src/main/java/org/scratchjr/android/ScratchJrActivity.java | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/android/ScratchJr/app/build.gradle b/android/ScratchJr/app/build.gradle
index 4914a7d..1839186 100644
--- a/android/ScratchJr/app/build.gradle
+++ b/android/ScratchJr/app/build.gradle
@@ -13,9 +13,6 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
- debug {
- debuggable true
- }
}
flavorDimensions 'scratchjrversion'
diff --git a/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java b/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
index 7e9b25e..47221a5 100644
--- a/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
+++ b/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
@@ -365,7 +365,7 @@ public class ScratchJrActivity
webSettings.setDisplayZoomControls(false);
webSettings.setLoadWithOverviewMode(false);
webSettings.setUseWideViewPort(false);
- if (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) {
+ if (BuildConfig.DEBUG) {
WebView.setWebContentsDebuggingEnabled(true);
}