demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Add missing permission alert for Bangle.js app loader

Browse Source
This commit is contained in:
Arjan Schrijver
2025-12-25 14:45:08 +01:00
committed by Arjan Schrijver
parent 1c777550b9
commit 0dd6c9a8d2
3 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/AppsManagementActivity.java
+19 -3
View File
@@ -26,12 +26,14 @@ import android.content.IntentFilter;
import android.net.Uri;
import android.os.Bundle;
import android.util.Base64;
import android.view.View;
import android.webkit.DownloadListener;
import android.webkit.JavascriptInterface;
import android.webkit.PermissionRequest;
import android.webkit.ValueCallback;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import android.widget.Toast;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -106,8 +108,10 @@ public class AppsManagementActivity extends AbstractGBActivity {
@Override
protected void onDestroy() {
webView.destroy();
webView = null;
if (webView != null) {
webView.destroy();
webView = null;
}
LocalBroadcastManager.getInstance(this).unregisterReceiver(deviceUpdateReceiver);
super.onDestroy();
finish();
@@ -189,8 +193,20 @@ public class AppsManagementActivity extends AbstractGBActivity {
}
private void initViews() {
//https://stackoverflow.com/questions/4325639/android-calling-javascript-functions-in-webview
webView = findViewById(R.id.webview);
LinearLayout permissionMissingAlert = findViewById(R.id.permission_missing_alert);
if (GBApplication.hasInternetAccess() && !GBApplication.hasDirectInternetAccess()) {
// Using the internethelper add-on app, check whether the Bangle.js app loader is allowed in settings
boolean appLoaderAllowed = GBApplication.getPrefs().getBoolean("pref_key_internethelper_allow_bangle_app_loader", false);
if (!appLoaderAllowed) {
webView.setVisibility(View.GONE);
permissionMissingAlert.setVisibility(View.VISIBLE);
return;
}
}
webView.setVisibility(View.VISIBLE);
permissionMissingAlert.setVisibility(View.GONE);
//https://stackoverflow.com/questions/4325639/android-calling-javascript-functions-in-webview
WebSettings settings = webView.getSettings();
settings.setJavaScriptEnabled(true);
settings.setDatabaseEnabled(true);
app/src/main/res/layout/activity_banglejs_apps_management.xml
+32 -1
View File
@@ -5,7 +5,38 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/permission_missing_alert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_warning">
</ImageView>
<TextView
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textAlignment="center"
android:textSize="20sp"
android:text="@string/internet_helper_banglejs_permission_missing_title">
</TextView>
<TextView
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textAlignment="center"
android:text="@string/internet_helper_banglejs_permission_missing_text">
</TextView>
</LinearLayout>
<WebView
android:id="@+id/webview"
app/src/main/res/values/strings.xml
+2
View File
@@ -4474,4 +4474,6 @@
<string name="notification_channel_pebble_js_runner">Pebble JS runner</string>
<string name="notification_pebble_js_service_title">Pebble JavaScript service</string>
<string name="notification_pebble_js_service_text">Running Pebble app/watchface JavaScript</string>
<string name="internet_helper_banglejs_permission_missing_title">Permission missing</string>
<string name="internet_helper_banglejs_permission_missing_text">Access to the Bangle.js app loader is currently not allowed by your settings. Please go to the internet helper settings in the external integrations settings to enable it.</string>
</resources>