+
+ );
+ }
+
if (
typeof minVersionCode === "number" &&
minVersionCode > BuildInfo.versionCode
@@ -288,7 +305,7 @@ function Buttons({
return (
+ + {strings["plugin-not-supported"]} +
+ {strings["plugin-not-supported-info"]} +
-
+
{strings["plugin min version"]
.replace("{name}", name)
.replace("{v-code}", minVersionCode)}
@@ -412,7 +429,7 @@ async function showReviews(pluginId, author) {
diff --git a/src/palettes/changeTheme/index.js b/src/palettes/changeTheme/index.js
index 7827f7054..b76e88f1d 100644
--- a/src/palettes/changeTheme/index.js
+++ b/src/palettes/changeTheme/index.js
@@ -1,5 +1,6 @@
import "./style.scss";
import palette from "components/palette";
+import config from "lib/config";
import appSettings from "lib/settings";
import { isDeviceDarkTheme } from "lib/systemConfiguration";
import themes from "theme/list";
@@ -22,7 +23,7 @@ function generateHints(type) {
const currentTheme = appSettings.value.appTheme;
const availableThemes = themes
.list()
- .filter((theme) => !(theme.version === "paid" && IS_FREE_VERSION));
+ .filter((theme) => !(theme.version === "paid" && !config.HAS_PRO));
return availableThemes.map((theme) => {
const isCurrent = theme.id === currentTheme;
diff --git a/src/plugins/auth/plugin.xml b/src/plugins/auth/plugin.xml
index e6e3e448c..521b422a3 100644
--- a/src/plugins/auth/plugin.xml
+++ b/src/plugins/auth/plugin.xml
@@ -7,6 +7,7 @@
+
diff --git a/src/plugins/auth/src/android/Authenticator.java b/src/plugins/auth/src/android/Authenticator.java
index 48bf3cc08..9458fec83 100644
--- a/src/plugins/auth/src/android/Authenticator.java
+++ b/src/plugins/auth/src/android/Authenticator.java
@@ -1,45 +1,52 @@
package com.foxdebug.acode.rk.auth;
-import android.util.Log; // Required for logging
+import android.util.Log;
+import android.webkit.CookieManager;
+import android.webkit.WebView;
import com.foxdebug.acode.rk.auth.EncryptedPreferenceManager;
import org.apache.cordova.*;
import org.json.JSONArray;
import org.json.JSONException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Scanner;
public class Authenticator extends CordovaPlugin {
- // Standard practice: use a TAG for easy filtering in Logcat
- private static final String TAG = "AcodeAuth";
+ private static final String TAG = "AcodeAuth";
private static final String PREFS_FILENAME = "acode_auth_secure";
private static final String KEY_TOKEN = "auth_token";
+ private static final String[] API_ORIGINS = {
+ "https://acode.app",
+ "https://dev.acode.app"
+ };
private EncryptedPreferenceManager prefManager;
@Override
protected void pluginInitialize() {
Log.d(TAG, "Initializing Authenticator Plugin...");
this.prefManager = new EncryptedPreferenceManager(this.cordova.getContext(), PREFS_FILENAME);
+
+ WebView androidWebView = (WebView) webView.getView();
+ CookieManager.getInstance().setAcceptThirdPartyCookies(androidWebView, true);
+
+ String token = prefManager.getString(KEY_TOKEN, "");
+ if (!token.isEmpty()) {
+ setTokenCookie(token);
+ }
}
@Override
public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
Log.i(TAG, "Native Action Called: " + action);
-
+
switch (action) {
case "logout":
- this.logout(callbackContext);
- return true;
- case "isLoggedIn":
- this.isLoggedIn(callbackContext);
- return true;
- case "getUserInfo":
- this.getUserInfo(callbackContext);
+ prefManager.remove(KEY_TOKEN);
+ cordova.getActivity().runOnUiThread(() -> clearTokenCookie());
+ if (callbackContext != null) callbackContext.success();
return true;
case "saveToken":
String token = args.getString(0);
Log.d(TAG, "Saving new token...");
prefManager.setString(KEY_TOKEN, token);
+ cordova.getActivity().runOnUiThread(() -> setTokenCookie(token));
callbackContext.success();
return true;
default:
@@ -48,101 +55,19 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
}
}
- private void logout(CallbackContext callbackContext) {
- Log.d(TAG, "Logging out, removing token.");
- prefManager.remove(KEY_TOKEN);
- if (callbackContext != null) callbackContext.success();
- }
-
- private void isLoggedIn(CallbackContext callbackContext) {
- String token = prefManager.getString(KEY_TOKEN, null);
- if (token == null) {
- Log.d(TAG, "isLoggedIn check: No token found in preferences.");
- callbackContext.error(0);
- return;
- }
-
- Log.d(TAG, "isLoggedIn check: Token found, validating with server...");
- final String tokenToValidate = token; // Make effectively final for lambda
-
- cordova.getThreadPool().execute(() -> {
- try {
- String result = validateToken(tokenToValidate);
- if (result != null) {
- Log.i(TAG, "Token validation successful.");
- callbackContext.success();
- } else {
- Log.w(TAG, "Token validation failed (result was null).");
- callbackContext.error(401);
- }
- } catch (Exception e) {
- Log.e(TAG, "CRITICAL error in isLoggedIn thread: " + e.getMessage(), e);
- callbackContext.error("Internal Plugin Error: " + e.getMessage());
- }
- });
- }
-
- private void getUserInfo(CallbackContext callbackContext) {
- Log.d(TAG, "getUserInfo: Fetching token...");
- String token = prefManager.getString(KEY_TOKEN, null);
-
- if (token == null) {
- Log.e(TAG, "getUserInfo: No token found.");
- callbackContext.error(0);
- return;
+ private void setTokenCookie(String token) {
+ CookieManager cm = CookieManager.getInstance();
+ for (String origin : API_ORIGINS) {
+ cm.setCookie(origin, "token=" + token + "; Path=/; Secure; HttpOnly; SameSite=None");
}
-
- final String tokenToValidate = token;
- cordova.getThreadPool().execute(() -> {
- try {
- String response = validateToken(tokenToValidate);
- if (response != null) {
- Log.d(TAG, "getUserInfo: Successfully fetched user info.");
- callbackContext.success(response);
- } else {
- Log.e(TAG, "getUserInfo: Validation failed or unauthorized.");
- callbackContext.error("Unauthorized");
- }
- } catch (Exception e) {
- Log.e(TAG, "Error in getUserInfo: " + e.getMessage(), e);
- callbackContext.error("Error: " + e.getMessage());
- }
- });
+ cm.flush();
}
- private String validateToken(String token) {
- HttpURLConnection conn = null;
- try {
- Log.d(TAG, "Network Request: Connecting to https://acode.app/api/login");
- URL url = new URL("https://acode.app/api/login"); // Changed from /api to /api/login
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("x-auth-token", token);
- conn.setRequestMethod("GET");
- conn.setConnectTimeout(5000);
- conn.setReadTimeout(5000); // Add read timeout too
-
- int code = conn.getResponseCode();
- Log.d(TAG, "Server responded with status code: " + code);
-
- if (code == 200) {
- Scanner s = new Scanner(conn.getInputStream(), "UTF-8").useDelimiter("\\A");
- String response = s.hasNext() ? s.next() : "";
- Log.d(TAG, "Response received: " + response); // Debug log
- return response;
- } else if (code == 401) {
- Log.w(TAG, "401 Unauthorized: Logging user out native-side.");
- logout(null);
- } else {
- Log.w(TAG, "Unexpected status code: " + code);
- }
- } catch (Exception e) {
- Log.e(TAG, "Network Exception in validateToken: " + e.getMessage(), e);
- e.printStackTrace(); // Print full stack trace for debugging
- } finally {
- if (conn != null) conn.disconnect();
+ private void clearTokenCookie() {
+ CookieManager cm = CookieManager.getInstance();
+ for (String origin : API_ORIGINS) {
+ cm.setCookie(origin, "token=; Path=/; Max-Age=0");
}
- return null;
+ cm.flush();
}
-
-
}
diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js
index c2284cbce..bea578723 100644
--- a/src/settings/appSettings.js
+++ b/src/settings/appSettings.js
@@ -1,12 +1,11 @@
import fsOperation from "fileSystem";
-import ajax from "@deadlyjack/ajax";
import { resetKeyBindings } from "cm/commandRegistry";
import settingsPage from "components/settingsPage";
import loader from "dialogs/loader";
import select from "dialogs/select";
import actions from "handlers/quickTools";
import actionStack from "lib/actionStack";
-import constants from "lib/constants";
+import config from "lib/config";
import fonts from "lib/fonts";
import lang from "lib/lang";
import openFile from "lib/openFile";
@@ -354,11 +353,9 @@ export default function otherSettings() {
strings["downloading..."],
);
try {
- const erudaScript = await ajax({
- url: constants.ERUDA_CDN,
- responseType: "text",
- contentType: "application/x-www-form-urlencoded",
- });
+ const erudaScript = await fsOperation(config.ERUDA_CDN).readFile(
+ "utf-8",
+ );
await fsOperation(DATA_STORAGE).createFile("eruda.js", erudaScript);
loader.destroy();
} catch (error) {
diff --git a/src/settings/backupRestore.js b/src/settings/backupRestore.js
index e95b2b01b..6eebf73c3 100644
--- a/src/settings/backupRestore.js
+++ b/src/settings/backupRestore.js
@@ -4,7 +4,7 @@ import toast from "components/toast";
import alert from "dialogs/alert";
import confirm from "dialogs/confirm";
import loader from "dialogs/loader";
-import constants from "lib/constants";
+import config from "lib/config";
import appSettings from "lib/settings";
import FileBrowser from "pages/fileBrowser";
import helpers from "utils/helpers";
@@ -519,7 +519,7 @@ backupRestore.restore = async function (url) {
}
} else {
// Remote plugin case - fetch from API
- const pluginUrl = Url.join(constants.API_BASE, `plugin/${id}`);
+ const pluginUrl = Url.join(config.API_BASE, `plugin/${id}`);
let remotePlugin = null;
try {
diff --git a/src/settings/editorSettings.js b/src/settings/editorSettings.js
index 2a466c7b4..cf31d2bb7 100644
--- a/src/settings/editorSettings.js
+++ b/src/settings/editorSettings.js
@@ -1,5 +1,5 @@
import settingsPage from "components/settingsPage";
-import constants from "lib/constants";
+import config from "lib/config";
import fonts from "lib/fonts";
import appSettings from "lib/settings";
import scrollSettings from "./scrollSettings";
@@ -40,7 +40,7 @@ export default function editorSettings() {
prompt: strings["font size"],
promptOptions: {
required: true,
- match: constants.FONT_SIZE,
+ match: config.FONT_SIZE,
},
info: strings["settings-info-editor-font-size"],
category: categories.textLayout,
diff --git a/src/settings/helpSettings.js b/src/settings/helpSettings.js
index bd8cdf35a..5088e902c 100644
--- a/src/settings/helpSettings.js
+++ b/src/settings/helpSettings.js
@@ -1,5 +1,5 @@
import settingsPage from "components/settingsPage";
-import constants from "lib/constants";
+import config from "lib/config";
export default function help() {
const title = strings.help;
@@ -7,25 +7,25 @@ export default function help() {
{
key: "docs",
text: strings.documentation,
- link: constants.DOCS_URL,
+ link: config.DOCS_URL,
chevron: true,
},
{
key: "help",
text: strings.help,
- link: constants.TELEGRAM_URL,
+ link: config.TELEGRAM_URL,
chevron: true,
},
{
key: "faqs",
text: strings.faqs,
- link: `${constants.WEBSITE_URL}/faqs`,
+ link: `${config.BASE_URL}/faqs`,
chevron: true,
},
{
key: "bug_report",
text: strings.bug_report,
- link: `${constants.GITHUB_URL}/issues`,
+ link: `${config.GITHUB_URL}/issues`,
chevron: true,
},
];
diff --git a/src/settings/mainSettings.js b/src/settings/mainSettings.js
index dfaff6782..228770cc1 100644
--- a/src/settings/mainSettings.js
+++ b/src/settings/mainSettings.js
@@ -2,6 +2,7 @@ import settingsPage from "components/settingsPage";
import confirm from "dialogs/confirm";
import rateBox from "dialogs/rateBox";
import actionStack from "lib/actionStack";
+import config from "lib/config";
import openFile from "lib/openFile";
import removeAds from "lib/removeAds";
import appSettings from "lib/settings";
@@ -159,7 +160,7 @@ export default function mainSettings() {
},
];
- if (IS_FREE_VERSION) {
+ if (!config.HAS_PRO) {
items.push({
key: "adRewards",
text: strings["earn ad-free time"],
diff --git a/src/settings/scrollSettings.js b/src/settings/scrollSettings.js
index 0366f7280..0fcdaee8f 100644
--- a/src/settings/scrollSettings.js
+++ b/src/settings/scrollSettings.js
@@ -1,5 +1,5 @@
import settingsPage from "components/settingsPage";
-import constants from "lib/constants";
+import config from "lib/config";
import appSettings from "lib/settings";
export default function scrollSettings() {
@@ -56,13 +56,13 @@ export default function scrollSettings() {
function getScrollSpeedString(speed) {
switch (speed) {
- case constants.SCROLL_SPEED_FAST:
+ case config.SCROLL_SPEED_FAST:
return strings.fast;
- case constants.SCROLL_SPEED_SLOW:
+ case config.SCROLL_SPEED_SLOW:
return strings.slow;
- case constants.SCROLL_SPEED_FAST_X2:
+ case config.SCROLL_SPEED_FAST_X2:
return `${strings.fast} x2`;
- case constants.SCROLL_SPEED_NORMAL:
+ case config.SCROLL_SPEED_NORMAL:
return strings.normal;
default:
return strings.normal;
diff --git a/src/sidebarApps/extensions/index.js b/src/sidebarApps/extensions/index.js
index 56584fb35..d3f7c5a3c 100644
--- a/src/sidebarApps/extensions/index.js
+++ b/src/sidebarApps/extensions/index.js
@@ -1,14 +1,12 @@
import "./style.scss";
-
import fsOperation from "fileSystem";
-import ajax from "@deadlyjack/ajax";
import collapsableList from "components/collapsableList";
import Sidebar from "components/sidebar";
import alert from "dialogs/alert";
import prompt from "dialogs/prompt";
import select from "dialogs/select";
import purchaseListener from "handlers/purchase";
-import constants from "lib/constants";
+import config from "lib/config";
import InstallState from "lib/installState";
import loadPlugin from "lib/loadPlugin";
import settings from "lib/settings";
@@ -33,11 +31,10 @@ let isLoading = false;
let currentFilter = null;
let filterHasMore = true;
let isFilterLoading = false;
-const SUPPORTED_EDITOR = "cm";
function withSupportedEditor(url) {
const separator = url.includes("?") ? "&" : "?";
- return `${url}${separator}supported_editor=${SUPPORTED_EDITOR}`;
+ return `${url}${separator}supported_editor=${config.SUPPORTED_EDITOR}`;
}
const $header = (
@@ -151,7 +148,7 @@ async function loadMorePlugins() {
const response = await fetch(
withSupportedEditor(
- `${constants.API_BASE}/plugins?page=${currentPage}&limit=${LIMIT}`,
+ `${config.API_BASE}/plugins?page=${currentPage}&limit=${LIMIT}`,
),
);
const newPlugins = await response.json();
@@ -236,9 +233,7 @@ async function searchPlugin() {
try {
$searchResult.classList.add("loading");
const plugins = await fsOperation(
- withSupportedEditor(
- Url.join(constants.API_BASE, `plugins?name=${query}`),
- ),
+ withSupportedEditor(Url.join(config.API_BASE, `plugins?name=${query}`)),
).readFile("json");
installedPlugins = await listInstalledPlugins();
@@ -428,7 +423,7 @@ async function loadExplore() {
const response = await fetch(
withSupportedEditor(
- `${constants.API_BASE}/plugins?page=${currentPage}&limit=${LIMIT}`,
+ `${config.API_BASE}/plugins?page=${currentPage}&limit=${LIMIT}`,
),
);
const plugins = await response.json();
@@ -495,13 +490,13 @@ async function getFilteredPlugins(filterState) {
if (filterState.value === "top_rated") {
response = await fetch(
withSupportedEditor(
- `${constants.API_BASE}/plugins?explore=random&page=${page}&limit=${LIMIT}`,
+ `${config.API_BASE}/plugins?explore=random&page=${page}&limit=${LIMIT}`,
),
);
} else {
response = await fetch(
withSupportedEditor(
- `${constants.API_BASE}/plugin?orderBy=${filterState.value}&page=${page}&limit=${LIMIT}`,
+ `${config.API_BASE}/plugin?orderBy=${filterState.value}&page=${page}&limit=${LIMIT}`,
),
);
}
@@ -542,7 +537,7 @@ async function getFilteredPlugins(filterState) {
const page = filterState.nextPage;
const response = await fetch(
withSupportedEditor(
- `${constants.API_BASE}/plugins?page=${page}&limit=${LIMIT}`,
+ `${config.API_BASE}/plugins?page=${page}&limit=${LIMIT}`,
),
);
const data = await response.json();
@@ -769,7 +764,7 @@ function ListItem({ icon, name, id, version, downloads, installed, source }) {
try {
let purchaseToken;
let product;
- const pluginUrl = Url.join(constants.API_BASE, `plugin/${id}`);
+ const pluginUrl = Url.join(config.API_BASE, `plugin/${id}`);
const remotePlugin = await fsOperation(pluginUrl)
.readFile("json")
.catch(() => {
@@ -803,12 +798,13 @@ function ListItem({ icon, name, id, version, downloads, installed, source }) {
async function onpurchase(e) {
const purchase = await getPurchase(product.productId);
- await ajax.post(Url.join(constants.API_BASE, "plugin/order"), {
- data: {
+ await fetch(Url.join(config.API_BASE, "plugin/order"), {
+ method: "POST",
+ body: JSON.stringify({
id: remotePlugin.id,
token: purchase?.purchaseToken,
package: BuildInfo.packageName,
- },
+ }),
});
purchaseToken = purchase?.purchaseToken;
}
diff --git a/src/sidebarApps/sidebarApp.js b/src/sidebarApps/sidebarApp.js
index 0c85339bc..49f43a984 100644
--- a/src/sidebarApps/sidebarApp.js
+++ b/src/sidebarApps/sidebarApp.js
@@ -3,7 +3,7 @@ let $apps;
/**@type {HTMLElement} */
let $sidebar;
/**@type {HTMLElement} */
-let $contaienr;
+let $container;
export default class SidebarApp {
/**@type {HTMLSpanElement} */
@@ -96,14 +96,14 @@ export default class SidebarApp {
// Try to replace the old container, or append if it's not in the DOM
try {
if (oldContainer && oldContainer.parentNode === $sidebar) {
- $sidebar.replaceChild($contaienr, oldContainer);
+ $sidebar.replaceChild($container, oldContainer);
} else {
// Old container not in sidebar, just append the new one
const existingContainer = $sidebar.get(".container");
if (existingContainer) {
- $sidebar.replaceChild($contaienr, existingContainer);
+ $sidebar.replaceChild($container, existingContainer);
} else {
- $sidebar.appendChild($contaienr);
+ $sidebar.appendChild($container);
}
}
} catch (error) {
@@ -113,7 +113,7 @@ export default class SidebarApp {
if (existingContainer) {
existingContainer.remove();
}
- $sidebar.appendChild($contaienr);
+ $sidebar.appendChild($container);
}
this.#onselect(this.#container);
}
@@ -171,10 +171,10 @@ function Icon({ icon, id, title }) {
* @returns {HTMLElement}
*/
function getContainer($el) {
- const res = $contaienr;
+ const res = $container;
if ($el) {
- $contaienr = $el;
+ $container = $el;
}
return res || $sidebar.get(".container");
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index d9337ef4d..5ac96100e 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -1,10 +1,9 @@
import fsOperation from "fileSystem";
-import ajax from "@deadlyjack/ajax";
import { getModeForPath as getCMModeForPath } from "cm/modelist";
import alert from "dialogs/alert";
import escapeStringRegexp from "escape-string-regexp";
import adRewards from "lib/adRewards";
-import constants from "lib/constants";
+import config from "lib/config";
import path from "./Path";
import Uri from "./Uri";
import Url from "./Url";
@@ -289,7 +288,7 @@ export default {
editorManager.emit("update", "file-delete");
},
canShowAds() {
- return Boolean(IS_FREE_VERSION && adRewards.canShowAds());
+ return Boolean(!config.HAS_PRO && adRewards.canShowAds());
},
async showInterstitialIfReady() {
if (!this.canShowAds()) return false;
@@ -330,8 +329,8 @@ export default {
},
async checkAPIStatus() {
try {
- const { status } = await ajax.get(Url.join(constants.API_BASE, "status"));
- return status === "ok";
+ const res = await fetch(Url.join(config.API_BASE, "status"));
+ return res.ok;
} catch (error) {
window.log("error", error);
return false;
diff --git a/utils/lang.js b/utils/lang.js
index d3390e426..78b0dc1a8 100755
--- a/utils/lang.js
+++ b/utils/lang.js
@@ -83,7 +83,7 @@ function addToAllFiles() {
}
strings[key] = val;
- const newText = JSON.stringify(strings, undefined, 2);
+ const newText = JSON.stringify(strings, undefined, "\t");
fs.writeFileSync(file, newText, "utf8");
console.log(`${lang}: Added ✓`);
addedCount++;
@@ -161,7 +161,7 @@ function bulkAddStrings() {
}
if (addedCount > 0) {
- const newText = JSON.stringify(strings, undefined, 2);
+ const newText = JSON.stringify(strings, undefined, "\t");
fs.writeFileSync(file, newText, "utf8");
}
@@ -257,7 +257,7 @@ async function update() {
if (flagError) {
if (fix) {
total += 1;
- const langJSONData = JSON.stringify(langData, undefined, 2);
+ const langJSONData = JSON.stringify(langData, undefined, "\t");
fs.writeFile(langFile, langJSONData, (err) => {
if (err) {
console.error(err);
@@ -353,7 +353,7 @@ async function update() {
const text = fs.readFileSync(file, "utf8");
const strings = modify(JSON.parse(text));
if (strings) {
- const newText = JSON.stringify(strings, undefined, 2);
+ const newText = JSON.stringify(strings, undefined, "\t");
fs.writeFile(file, newText, "utf8", (err) => {
if (err) {
console.error(err);