Add missing permission, small code cleanups.

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

app/src/main/java/org/briarproject/publicmesh/wifidirect/WifiDirectServiceImpl.java

@@ -504,10 +504,7 @@ class WifiDirectServiceImpl implements WifiDirectService, Service {
 		removeServiceRequest();
 		if (SDK_INT >= 27) requireNonNull(channel).close();
 		channel = null;
-		if (networkId != -1) {
-			removeNetwork();
-			networkId = -1;
-		}
+		removeNetwork();
 		releaseLock();
 		discoveryStatus.postValue(STOPPED);
 		LOG.info("Released service discovery");
@@ -556,14 +553,12 @@ class WifiDirectServiceImpl implements WifiDirectService, Service {
 		ActionListener listener = new ActionListener() {
 			@Override
 			public void onSuccess() {
-				LOG.info("Removed group");
-				connectionInProgress = false;
+				LOG.info("Removed service request");
 			}
 
 			@Override
 			public void onFailure(int reason) {
-				LOG.info("Failed to remove group: " + reason);
-				connectionInProgress = false;
+				LOG.info("Failed to remove service request: " + reason);
 			}
 		};
 		try {
@@ -576,12 +571,14 @@ class WifiDirectServiceImpl implements WifiDirectService, Service {
 	}
 
 	private void removeNetwork() {
+		if (networkId == -1) return;
 		try {
 			if (requireNonNull(wifiManager).removeNetwork(networkId)) LOG.info("Removed network");
 			else LOG.info("Failed to remove network");
 		} catch (SecurityException e) {
 			LOG.info("Failed to remove network: " + e);
 		}
+		networkId = -1;
 	}
 
 	@Override