diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 88985138..8b011b8e 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -15,10 +15,10 @@
android:allowBackup="true"
android:icon="@drawable/icon"
android:label="@string/app_name"
- android:theme="@android:style/Theme.Holo.Light.DarkActionBar"
android:requestLegacyExternalStorage="true"
- android:usesCleartextTraffic="true"
- >
+ android:theme="@android:style/Theme.Holo.Light.DarkActionBar"
+ android:usesCleartextTraffic="true">
+
@@ -31,10 +31,10 @@
android:label="@string/app_name">
+
-
@@ -52,4 +52,5 @@
android:value="org.purplei2p.i2pd.I2PDPermsAskerActivity" />
-
+
+
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index ace2047a..7d25e28b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,6 +21,8 @@ repositories {
dependencies {
implementation 'androidx.core:core:1.0.2'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
}
android {
@@ -90,7 +92,7 @@ android {
}
}
-ext.abiCodes = ['armeabi-v7a':1, 'x86':2, 'arm64-v8a':3, 'x86_64':4]
+ext.abiCodes = ['armeabi-v7a': 1, 'x86': 2, 'arm64-v8a': 3, 'x86_64': 4]
import com.android.build.OutputFile
android.applicationVariants.all { variant ->
diff --git a/android/res/layout/webview.xml b/android/res/layout/activity_web_console.xml
similarity index 82%
rename from android/res/layout/webview.xml
rename to android/res/layout/activity_web_console.xml
index 887896a7..5724b387 100644
--- a/android/res/layout/webview.xml
+++ b/android/res/layout/activity_web_console.xml
@@ -1,12 +1,14 @@
+
+ tools:context=".WebConsoleActivity">
+
diff --git a/android/src/org/purplei2p/i2pd/I2PDActivity.java b/android/src/org/purplei2p/i2pd/I2PDActivity.java
index 97870e63..9645d4f7 100755
--- a/android/src/org/purplei2p/i2pd/I2PDActivity.java
+++ b/android/src/org/purplei2p/i2pd/I2PDActivity.java
@@ -276,15 +276,8 @@ public class I2PDActivity extends Activity {
return true;
case R.id.action_start_webview:
- setContentView(R.layout.webview);
- final WebView webView = findViewById(R.id.webview1);
- webView.setWebViewClient(new WebViewClient());
-
- final WebSettings webSettings = webView.getSettings();
- webSettings.setBuiltInZoomControls(true);
- webSettings.setJavaScriptEnabled(false);
- webView.loadUrl("http://127.0.0.1:7070"); // TODO: instead 7070 I2Pd....HttpPort
- break;
+ startActivity(new Intent(getApplicationContext(), WebConsoleActivity.class));
+ return true;
}
return super.onOptionsItemSelected(item);
diff --git a/android/src/org/purplei2p/i2pd/WebConsoleActivity.java b/android/src/org/purplei2p/i2pd/WebConsoleActivity.java
new file mode 100644
index 00000000..24e6baeb
--- /dev/null
+++ b/android/src/org/purplei2p/i2pd/WebConsoleActivity.java
@@ -0,0 +1,41 @@
+package org.purplei2p.i2pd;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import java.util.Objects;
+
+public class WebConsoleActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_web_console);
+
+ Objects.requireNonNull(getActionBar()).setDisplayHomeAsUpEnabled(true);
+
+ final WebView webView = findViewById(R.id.webview1);
+ webView.setWebViewClient(new WebViewClient());
+
+ final WebSettings webSettings = webView.getSettings();
+ webSettings.setBuiltInZoomControls(true);
+ webSettings.setJavaScriptEnabled(false);
+ webView.loadUrl("http://127.0.0.1:7070"); // TODO: instead 7070 I2Pd....HttpPort
+ }
+
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+
+ if (id==android.R.id.home) {
+ finish();
+ return true;
+ }
+ return false;
+ }
+}