mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-13 11:19:04 +01:00
Target Android SDK 35
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="org.briarproject.briar">
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-feature
|
||||
android:name="android.hardware.bluetooth"
|
||||
|
||||
@@ -176,7 +176,7 @@ public class BriarService extends Service {
|
||||
filter.addAction("android.intent.action.QUICKBOOT_POWEROFF");
|
||||
filter.addAction("com.htc.intent.action.QUICKBOOT_POWEROFF");
|
||||
AndroidUtils.registerReceiver(getApplicationContext(), receiver,
|
||||
filter);
|
||||
filter, false);
|
||||
}, "LifecycleStartup");
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ class DozeWatchdogImpl implements DozeWatchdog, Service {
|
||||
filter.addAction(ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED);
|
||||
filter.addAction(ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED);
|
||||
}
|
||||
registerReceiver(appContext, receiver, filter);
|
||||
registerReceiver(appContext, receiver, filter, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -208,7 +208,7 @@ class ScreenFilterMonitorImpl implements ScreenFilterMonitor, Service {
|
||||
filter.addAction(ACTION_PACKAGE_REPLACED);
|
||||
filter.addDataScheme("package");
|
||||
receiver = new PackageBroadcastReceiver();
|
||||
registerReceiver(app, receiver, filter);
|
||||
registerReceiver(app, receiver, filter, false);
|
||||
cachedApps = null;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ class AddNearbyContactViewModel extends AndroidViewModel
|
||||
qrCodeDecoder = new QrCodeDecoder(androidExecutor, ioExecutor, this);
|
||||
eventBus.addListener(this);
|
||||
IntentFilter filter = new IntentFilter(ACTION_SCAN_MODE_CHANGED);
|
||||
registerReceiver(getApplication(), bluetoothReceiver, filter);
|
||||
registerReceiver(getApplication(), bluetoothReceiver, filter, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -97,7 +97,8 @@ public class PluginViewModel extends DbViewModel implements EventListener {
|
||||
this.eventBus = eventBus;
|
||||
eventBus.addListener(this);
|
||||
receiver = new BluetoothStateReceiver();
|
||||
registerReceiver(app, receiver, new IntentFilter(ACTION_STATE_CHANGED));
|
||||
registerReceiver(app, receiver, new IntentFilter(ACTION_STATE_CHANGED),
|
||||
false);
|
||||
networkStatus.setValue(networkManager.getNetworkStatus());
|
||||
torPluginState.setValue(getTransportState(TorConstants.ID));
|
||||
wifiPluginState.setValue(getTransportState(LanTcpConstants.ID));
|
||||
|
||||
@@ -200,6 +200,7 @@ class BriarReportCollector {
|
||||
storageInfo);
|
||||
}
|
||||
|
||||
@SuppressLint({"HardwareIds", "MissingPermission"})
|
||||
private ReportItem getConnectivity() {
|
||||
MultiReportInfo connectivityInfo = new MultiReportInfo();
|
||||
|
||||
@@ -282,13 +283,14 @@ class BriarReportCollector {
|
||||
connectivityInfo.add("BluetoothAvailable", true);
|
||||
|
||||
// Is Bluetooth enabled?
|
||||
@SuppressLint("HardwareIds")
|
||||
boolean btEnabled = hasBtConnectPermission(ctx) && bt.isEnabled()
|
||||
&& !isNullOrEmpty(bt.getAddress());
|
||||
boolean btEnabled = hasBtConnectPermission(ctx) && bt.isEnabled();
|
||||
try {
|
||||
btEnabled = btEnabled && !isNullOrEmpty(bt.getAddress());
|
||||
} catch (SecurityException ignored) {
|
||||
}
|
||||
connectivityInfo.add("BluetoothEnabled", btEnabled);
|
||||
|
||||
// Is Bluetooth connectable?
|
||||
@SuppressLint("MissingPermission")
|
||||
int scanMode = areBluetoothPermissionsGranted(ctx) ?
|
||||
bt.getScanMode() : -1;
|
||||
boolean btConnectable = scanMode == SCAN_MODE_CONNECTABLE ||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package org.briarproject.briar.android.view;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
@@ -38,6 +39,7 @@ public class SnackbarAwareBehavior<V extends View> extends Behavior<V> {
|
||||
setMargin(child, 0);
|
||||
}
|
||||
|
||||
@SuppressLint("RestrictedApi")
|
||||
@Override
|
||||
public boolean layoutDependsOn(CoordinatorLayout parent,
|
||||
V child, View dependency) {
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
|
||||
|
||||
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
||||
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||
</style>
|
||||
|
||||
<style name="BriarTheme.NoActionBar" parent="BriarTheme">
|
||||
|
||||
Reference in New Issue
Block a user