Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Keep the screen on while the hotspot is running.

Browse Source
This commit is contained in:
akwizgran
2021-07-09 11:32:58 +01:00
committed by Torsten Grote
parent f9494d71de
commit 806fce8c34
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.android.hotspot; package org.briarproject.briar.android.hotspot;
import android.annotation.SuppressLint;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -10,6 +11,7 @@ import android.net.wifi.p2p.WifiP2pManager;
import android.net.wifi.p2p.WifiP2pManager.ActionListener; import android.net.wifi.p2p.WifiP2pManager.ActionListener;
import android.net.wifi.p2p.WifiP2pManager.GroupInfoListener; import android.net.wifi.p2p.WifiP2pManager.GroupInfoListener;
import android.os.Handler; import android.os.Handler;
import android.os.PowerManager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -34,6 +36,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import static android.content.Context.POWER_SERVICE;
import static android.content.Context.WIFI_P2P_SERVICE; import static android.content.Context.WIFI_P2P_SERVICE;
import static android.content.Context.WIFI_SERVICE; import static android.content.Context.WIFI_SERVICE;
import static android.net.wifi.WifiManager.WIFI_MODE_FULL; import static android.net.wifi.WifiManager.WIFI_MODE_FULL;
@@ -44,6 +47,7 @@ import static android.net.wifi.p2p.WifiP2pManager.ERROR;
import static android.net.wifi.p2p.WifiP2pManager.NO_SERVICE_REQUESTS; import static android.net.wifi.p2p.WifiP2pManager.NO_SERVICE_REQUESTS;
import static android.net.wifi.p2p.WifiP2pManager.P2P_UNSUPPORTED; import static android.net.wifi.p2p.WifiP2pManager.P2P_UNSUPPORTED;
import static android.os.Build.VERSION.SDK_INT; import static android.os.Build.VERSION.SDK_INT;
import static android.os.PowerManager.FULL_WAKE_LOCK;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.briar.android.util.UiUtils.handleException; import static org.briarproject.briar.android.util.UiUtils.handleException;
@@ -84,11 +88,13 @@ class HotspotManager implements ActionListener {
private final SecureRandom random; private final SecureRandom random;
private final WifiManager wifiManager; private final WifiManager wifiManager;
private final WifiP2pManager wifiP2pManager; private final WifiP2pManager wifiP2pManager;
private final PowerManager powerManager;
private final Handler handler; private final Handler handler;
private final String lockTag; private final String lockTag;
private HotspotListener listener; private HotspotListener listener;
private WifiManager.WifiLock wifiLock; private WifiManager.WifiLock wifiLock;
private PowerManager.WakeLock wakeLock;
private WifiP2pManager.Channel channel; private WifiP2pManager.Channel channel;
@RequiresApi(29) @RequiresApi(29)
private volatile NetworkConfig savedNetworkConfig; private volatile NetworkConfig savedNetworkConfig;
@@ -110,6 +116,7 @@ class HotspotManager implements ActionListener {
.getSystemService(WIFI_SERVICE); .getSystemService(WIFI_SERVICE);
wifiP2pManager = wifiP2pManager =
(WifiP2pManager) ctx.getSystemService(WIFI_P2P_SERVICE); (WifiP2pManager) ctx.getSystemService(WIFI_P2P_SERVICE);
powerManager = (PowerManager) ctx.getSystemService(POWER_SERVICE);
handler = new Handler(ctx.getMainLooper()); handler = new Handler(ctx.getMainLooper());
lockTag = ctx.getPackageName() + ":app-sharing-hotspot"; lockTag = ctx.getPackageName() + ":app-sharing-hotspot";
} }
@@ -143,12 +150,12 @@ class HotspotManager implements ActionListener {
.setNetworkName(savedNetworkConfig.ssid) .setNetworkName(savedNetworkConfig.ssid)
.setPassphrase(savedNetworkConfig.password) .setPassphrase(savedNetworkConfig.password)
.build(); .build();
acquireLock(); acquireLocks();
wifiP2pManager.createGroup(channel, config, this); wifiP2pManager.createGroup(channel, config, this);
}); });
}); });
} else { } else {
acquireLock(); acquireLocks();
wifiP2pManager.createGroup(channel, this); wifiP2pManager.createGroup(channel, this);
} }
} catch (SecurityException e) { } catch (SecurityException e) {
@@ -204,7 +211,10 @@ class HotspotManager implements ActionListener {
}); });
} }
private void acquireLock() { @SuppressLint("WakelockTimeout")
private void acquireLocks() {
wakeLock = powerManager.newWakeLock(FULL_WAKE_LOCK, lockTag);
wakeLock.acquire();
// WIFI_MODE_FULL has no effect on API >= 29 // WIFI_MODE_FULL has no effect on API >= 29
int lockType = int lockType =
SDK_INT >= 29 ? WIFI_MODE_FULL_HIGH_PERF : WIFI_MODE_FULL; SDK_INT >= 29 ? WIFI_MODE_FULL_HIGH_PERF : WIFI_MODE_FULL;
@@ -214,17 +224,18 @@ class HotspotManager implements ActionListener {
private void releaseHotspot() { private void releaseHotspot() {
listener.onHotspotStopped(); listener.onHotspotStopped();
closeChannelAndReleaseLock(); closeChannelAndReleaseLocks();
} }
private void releaseHotspotWithError(String error) { private void releaseHotspotWithError(String error) {
listener.onHotspotError(error); listener.onHotspotError(error);
closeChannelAndReleaseLock(); closeChannelAndReleaseLocks();
} }
private void closeChannelAndReleaseLock() { private void closeChannelAndReleaseLocks() {
if (SDK_INT >= 27) channel.close(); if (SDK_INT >= 27) channel.close();
channel = null; channel = null;
wakeLock.release();
wifiLock.release(); wifiLock.release();
} }