Skip to content

Commit abaf5b7

Browse files
fix. back button
1 parent ccaaddc commit abaf5b7

File tree

11 files changed

+52
-152
lines changed

11 files changed

+52
-152
lines changed

.vscode/plugins.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

android/app/capacitor.build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ android {
99

1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
12-
13-
implementation "com.google.android.gms:play-services-ads:20.6.0"
14-
implementation "com.google.android.ump:user-messaging-platform:1.0.0+"
12+
implementation project(':capacitor-app')
1513
implementation "androidx.webkit:webkit:1.4.0"
1614
implementation "commons-net:commons-net:3.11.1"
1715
implementation "com.android.billingclient:billing:6.0.1"

android/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher"
1010
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
11+
android:networkSecurityConfig="@xml/network_security_config"
12+
android:theme="@style/AppTheme"
13+
tools:targetApi="n">
1214

1315
<activity
1416
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"

android/app/src/main/java/com/foxdebug/acode/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
public class MainActivity extends BridgeActivity {
66

7-
}
7+
}

android/capacitor.settings.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
22
include ':capacitor-android'
33
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
4+
5+
include ':capacitor-app'
6+
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')

biome.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
"hooks/**/*",
4545
"fastlane/**/*",
4646
"res/**/*",
47-
"platforms/**/*"
47+
"platforms/**/*",
48+
"android/**"
4849
]
4950
}
5051
}

package-lock.json

Lines changed: 10 additions & 127 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
"cordova-plugin-system": {},
3636
"cordova-plugin-advanced-http": {
3737
"ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
38-
},
39-
"cordova-plugin-consent": {},
40-
"admob-plus-cordova": {
41-
"APP_ID_ANDROID": "ca-app-pub-5911839694379275~4255791238",
42-
"PLAY_SERVICES_VERSION": "21.5.0"
4338
}
4439
},
4540
"platforms": [
@@ -95,12 +90,11 @@
9590
},
9691
"dependencies": {
9792
"@capacitor/android": "^7.2.0",
93+
"@capacitor/app": "^7.0.1",
9894
"@deadlyjack/ajax": "^1.2.6",
9995
"@ungap/custom-elements": "^1.3.0",
100-
"admob-plus-cordova": "1.28.0",
10196
"autosize": "^6.0.1",
10297
"cordova": "12.0.0",
103-
"cordova-plugin-consent": "2.4.0",
10498
"core-js": "^3.37.1",
10599
"crypto-js": "^4.2.0",
106100
"dompurify": "^3.2.4",
@@ -122,4 +116,4 @@
122116
"yargs": "^17.7.2"
123117
},
124118
"browserslist": "cover 100%,not android < 5"
125-
}
119+
}

src/lib/main.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ import { getEncoding, initEncodings } from "utils/encodings";
5656
import auth, { loginEvents } from "./auth";
5757
import constants from "./constants";
5858

59+
import { App as CapacitorApp } from "@capacitor/app";
60+
5961
const previousVersionCode = Number.parseInt(localStorage.versionCode, 10);
6062

6163
window.onload = Main;
@@ -431,7 +433,7 @@ async function loadApp() {
431433
editorManager.on("rename-file", onFileUpdate);
432434
editorManager.on("switch-file", onFileUpdate);
433435
editorManager.on("file-loaded", onFileUpdate);
434-
navigator.app.overrideButton("menubutton", true);
436+
//navigator.app.overrideButton("menubutton", true);
435437
system.setIntentHandler(intentHandler, intentHandler.onError);
436438
system.getCordovaIntent(intentHandler, intentHandler.onError);
437439
setTimeout(showTutorials, 1000);
@@ -651,12 +653,21 @@ function showTutorials() {
651653
}
652654
}
653655

654-
function backButtonHandler() {
656+
function backButtonHandler(event) {
657+
event.preventDefault();
658+
655659
if (keydownState.esc) {
656660
keydownState.esc = false;
657661
return;
658662
}
659-
actionStack.pop();
663+
664+
const top = actionStack.pop();
665+
666+
if (top && typeof top.action === "function") {
667+
top.action();
668+
} else {
669+
//CapacitorApp.exitApp();
670+
}
660671
}
661672

662673
function menuButtonHandler() {

src/plugins/server/src/android/com/foxdebug/server/NanoHTTPDWebserver.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,15 @@ public Response serve(IHTTPSession session) {
298298
responseObject.getString("body")
299299
);
300300

301-
Iterator<?> keys = responseObject.getJSONObject("headers").keys();
302-
while (keys.hasNext()) {
303-
String key = (String) keys.next();
304-
response.addHeader(
305-
key,
306-
responseObject.getJSONObject("headers").getString(key)
307-
);
301+
if (responseObject.has("headers")) {
302+
JSONObject headers = responseObject.getJSONObject("headers");
303+
Iterator<?> keys = headers.keys();
304+
while (keys.hasNext()) {
305+
String key = (String) keys.next();
306+
response.addHeader(key, headers.getString(key));
307+
}
308308
}
309+
309310
} catch (JSONException e) {
310311
e.printStackTrace();
311312
}

0 commit comments

Comments
 (0)