Skip to content

Commit

Permalink
Restyled by google-java-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@restyled-commits @wgtdkp
restyled-commits authored and wgtdkp committed Aug 6, 2020
1 parent e30fdc1 commit 2831733
Show file tree
Hide file tree
Showing 9 changed files with 386 additions and 335 deletions.
88 changes: 48 additions & 40 deletions ...IPTool/app/src/main/java/com/google/chip/chiptool/commissioner/BorderAgentDiscoverer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import androidx.annotation.RequiresPermission;
import java.util.Map;

public class BorderAgentDiscoverer implements NsdManager.DiscoveryListener {
public class BorderAgentDiscoverer implements NsdManager.DiscoveryListener {

private static final String TAG = BorderAgentDiscoverer.class.getSimpleName();

Expand All @@ -50,7 +50,7 @@ public BorderAgentDiscoverer(Context context, NetworkAdapter networkAdapter) {
WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
wifiMulticastLock = wifi.createMulticastLock("multicastLock");

nsdManager = (NsdManager)context.getSystemService(Context.NSD_SERVICE);
nsdManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE);

this.networkAdapter = networkAdapter;
}
Expand All @@ -59,7 +59,8 @@ public void start() {
wifiMulticastLock.setReferenceCounted(true);
wifiMulticastLock.acquire();

nsdManager.discoverServices(BorderAgentDiscoverer.SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD, this);
nsdManager.discoverServices(
BorderAgentDiscoverer.SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD, this);
}

public void stop() {
Expand All @@ -85,45 +86,52 @@ public void onDiscoveryStopped(String serviceType) {
public void onServiceFound(NsdServiceInfo nsdServiceInfo) {
Log.d(TAG, "a Border Agent service found");

nsdManager.resolveService(nsdServiceInfo, new NsdManager.ResolveListener() {
@Override
public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) {
Log.e(TAG, String.format("failed to resolve service %s, error: %d", serviceInfo.toString(), errorCode));
}

@Override
public void onServiceResolved(NsdServiceInfo serviceInfo) {
Log.d(TAG, "successfully resolved service " + serviceInfo.toString());

Map<String, byte[]> attrs = serviceInfo.getAttributes();

String discriminator = "CC11BB22";

try {
if (attrs.containsKey(KEY_DISCRIMINATOR)) {
discriminator = new String(attrs.get(KEY_DISCRIMINATOR));
nsdManager.resolveService(
nsdServiceInfo,
new NsdManager.ResolveListener() {
@Override
public void onResolveFailed(NsdServiceInfo serviceInfo, int errorCode) {
Log.e(
TAG,
String.format(
"failed to resolve service %s, error: %d", serviceInfo.toString(), errorCode));
}
final BorderAgentInfo borderAgent = new BorderAgentInfo(
discriminator,
new String(attrs.get(KEY_NETWORK_NAME)),
attrs.get(KEY_EXTENDED_PAN_ID),
serviceInfo.getHost(),
serviceInfo.getPort(),
PSKC);

Handler handler = new Handler(Looper.getMainLooper());
handler.post(new Runnable() {
@RequiresPermission(Manifest.permission.CAMERA)
@Override
public void run () {
networkAdapter.addNetwork(new NetworkInfo(borderAgent));

@Override
public void onServiceResolved(NsdServiceInfo serviceInfo) {
Log.d(TAG, "successfully resolved service " + serviceInfo.toString());

Map<String, byte[]> attrs = serviceInfo.getAttributes();

String discriminator = "CC11BB22";

try {
if (attrs.containsKey(KEY_DISCRIMINATOR)) {
discriminator = new String(attrs.get(KEY_DISCRIMINATOR));
}
final BorderAgentInfo borderAgent =
new BorderAgentInfo(
discriminator,
new String(attrs.get(KEY_NETWORK_NAME)),
attrs.get(KEY_EXTENDED_PAN_ID),
serviceInfo.getHost(),
serviceInfo.getPort(),
PSKC);

Handler handler = new Handler(Looper.getMainLooper());
handler.post(
new Runnable() {
@RequiresPermission(Manifest.permission.CAMERA)
@Override
public void run() {
networkAdapter.addNetwork(new NetworkInfo(borderAgent));
}
});
} catch (Exception e) {
Log.e(TAG, "invalid Border Agent service: " + e.toString());
}
});
} catch (Exception e) {
Log.e(TAG, "invalid Border Agent service: " + e.toString());
}
}
});
}
});
}

@Override
Expand Down
89 changes: 48 additions & 41 deletions ...oid/CHIPTool/app/src/main/java/com/google/chip/chiptool/commissioner/BorderAgentInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,58 +25,65 @@
import java.net.UnknownHostException;

public class BorderAgentInfo implements Parcelable {
public String discriminator;
public String networkName;
public byte[] extendedPanId;
public InetAddress host;
public int port;
public byte[] pskc;
public String discriminator;
public String networkName;
public byte[] extendedPanId;
public InetAddress host;
public int port;
public byte[] pskc;

public BorderAgentInfo(@NonNull String discriminator, @NonNull String networkName, @NonNull byte[] extendedPanId, @NonNull InetAddress host, @NonNull int port, @NonNull byte[] pskc) {
this.discriminator = discriminator;
this.networkName = networkName;
this.extendedPanId = extendedPanId;
this.host = host;
this.port = port;
this.pskc = pskc;
}
public BorderAgentInfo(
@NonNull String discriminator,
@NonNull String networkName,
@NonNull byte[] extendedPanId,
@NonNull InetAddress host,
@NonNull int port,
@NonNull byte[] pskc) {
this.discriminator = discriminator;
this.networkName = networkName;
this.extendedPanId = extendedPanId;
this.host = host;
this.port = port;
this.pskc = pskc;
}

protected BorderAgentInfo(Parcel in) {
discriminator = in.readString();
networkName = in.readString();
extendedPanId = in.createByteArray();
try {
host = InetAddress.getByAddress(in.createByteArray());
} catch (UnknownHostException e) {
}
port = in.readInt();
pskc = in.createByteArray();
protected BorderAgentInfo(Parcel in) {
discriminator = in.readString();
networkName = in.readString();
extendedPanId = in.createByteArray();
try {
host = InetAddress.getByAddress(in.createByteArray());
} catch (UnknownHostException e) {
}
port = in.readInt();
pskc = in.createByteArray();
}

@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(discriminator);
dest.writeString(networkName);
dest.writeByteArray(extendedPanId);
dest.writeByteArray(host.getAddress());
dest.writeInt(port);
dest.writeByteArray(pskc);
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(discriminator);
dest.writeString(networkName);
dest.writeByteArray(extendedPanId);
dest.writeByteArray(host.getAddress());
dest.writeInt(port);
dest.writeByteArray(pskc);
}

@Override
public int describeContents() {
return 0;
}
@Override
public int describeContents() {
return 0;
}

public static final Creator<BorderAgentInfo> CREATOR = new Creator<BorderAgentInfo>() {
public static final Creator<BorderAgentInfo> CREATOR =
new Creator<BorderAgentInfo>() {
@Override
public BorderAgentInfo createFromParcel(Parcel in) {
return new BorderAgentInfo(in);
return new BorderAgentInfo(in);
}

@Override
public BorderAgentInfo[] newArray(int size) {
return new BorderAgentInfo[size];
return new BorderAgentInfo[size];
}
};
};
}
2 changes: 0 additions & 2 deletions ...HIPTool/app/src/main/java/com/google/chip/chiptool/commissioner/CommissionerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import androidx.appcompat.app.AppCompatActivity;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.fragment.NavHostFragment;
import com.google.chip.chiptool.CHIPToolActivity;
import com.google.chip.chiptool.R;
import com.google.chip.chiptool.setuppayloadscanner.BarcodeFragment;
import com.google.chip.chiptool.setuppayloadscanner.CHIPDeviceInfo;
Expand Down
Loading

0 comments on commit 2831733

Please sign in to comment.