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

Add null-safety and thread-safety annotations.

Browse Source
This commit is contained in:
akwizgran
2018-08-02 15:06:17 +01:00
parent 1a5c02f8a9
commit 8c5c66fa9a
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java
View File

@@ -13,6 +13,8 @@ import org.briarproject.bramble.api.lifecycle.Service;
import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.network.NetworkManager;
import org.briarproject.bramble.api.network.NetworkStatus; import org.briarproject.bramble.api.network.NetworkStatus;
import org.briarproject.bramble.api.network.event.NetworkStatusEvent; import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.system.Scheduler; import org.briarproject.bramble.api.system.Scheduler;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@@ -22,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static android.content.Context.CONNECTIVITY_SERVICE; import static android.content.Context.CONNECTIVITY_SERVICE;
@@ -35,6 +38,8 @@ import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
class AndroidNetworkManager implements NetworkManager, Service { class AndroidNetworkManager implements NetworkManager, Service {
private static final Logger LOG = private static final Logger LOG =
@@ -122,7 +127,7 @@ class AndroidNetworkManager implements NetworkManager, Service {
} }
} }
private boolean isSleepOrDozeEvent(String action) { private boolean isSleepOrDozeEvent(@Nullable String action) {
boolean isSleep = ACTION_SCREEN_ON.equals(action) || boolean isSleep = ACTION_SCREEN_ON.equals(action) ||
ACTION_SCREEN_OFF.equals(action); ACTION_SCREEN_OFF.equals(action);
boolean isDoze = SDK_INT >= 23 && boolean isDoze = SDK_INT >= 23 &&
@@ -130,7 +135,7 @@ class AndroidNetworkManager implements NetworkManager, Service {
return isSleep || isDoze; return isSleep || isDoze;
} }
private boolean isApEvent(String action) { private boolean isApEvent(@Nullable String action) {
return WIFI_AP_STATE_CHANGED_ACTION.equals(action); return WIFI_AP_STATE_CHANGED_ACTION.equals(action);
} }
} }

3
bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkManager.java
View File

@@ -1,5 +1,8 @@
package org.briarproject.bramble.api.network; package org.briarproject.bramble.api.network;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
public interface NetworkManager { public interface NetworkManager {
NetworkStatus getNetworkStatus(); NetworkStatus getNetworkStatus();

6
bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java
View File

@@ -1,5 +1,11 @@
package org.briarproject.bramble.api.network; package org.briarproject.bramble.api.network;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class NetworkStatus { public class NetworkStatus {
private final boolean connected, wifi; private final boolean connected, wifi;

5
bramble-api/src/main/java/org/briarproject/bramble/api/network/event/NetworkStatusEvent.java
View File

@@ -2,7 +2,12 @@ package org.briarproject.bramble.api.network.event;
import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.network.NetworkStatus; import org.briarproject.bramble.api.network.NetworkStatus;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class NetworkStatusEvent extends Event { public class NetworkStatusEvent extends Event {
private final NetworkStatus status; private final NetworkStatus status;