Skip to content

Resuse HashMaps in Wifi scanning/ranging code instead of creating them #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hlxid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resuse HashMaps in Wifi scanning/ranging code instead of creating them #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions CongressRoutePlanner/app/src/main/java/de/c3nav/droid/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,12 +1257,11 @@ static class SuggestedWifiPeer {
}

public void processWifiScanResults(List<ScanResult> results) {
Map<String, ScanResult> resultMap = new HashMap<>();
lastWifiScanResults.clear();
for (ScanResult scanRes : results) {
resultMap.put(scanRes.BSSID, scanRes);
lastWifiScanResults.put(scanRes.BSSID, scanRes);
}
this.lastWifiScanResults = resultMap;
Log.d("c3nav", String.format("Nearby total ap count: %d", resultMap.size()));
Log.d("c3nav", String.format("Nearby total ap count: %d", lastWifiScanResults.size()));
pushWifiResultsToApp();
}

Expand Down Expand Up @@ -1369,7 +1368,7 @@ private void performWifiRangingScans(List<ResponderConfig> rangingPeers, List<Ra
@Override
public void onRangingFailure(int code) {
Log.w("rtt", String.format("ranging failure: %d", code));
MainActivity.this.lastWifiRangingResults = new HashMap<>();
MainActivity.this.lastWifiRangingResults.clear();
isRanging = false;
}

Expand Down Expand Up @@ -1401,16 +1400,15 @@ public void onRangingResults(@NonNull List<RangingResult> results) {
private void processWifiRangingResults(List<RangingResult> rangingResults) {
isRanging = false;

Map<String, RangingResult> resultMap = new HashMap<>();
lastWifiRangingResults.clear();
for (RangingResult result : rangingResults) {
MacAddress mac = result.getMacAddress();
if (mac != null && result.getStatus() == RangingResult.STATUS_SUCCESS) {
resultMap.put(mac.toString(), result);
lastWifiRangingResults.put(mac.toString(), result);
}
}

Log.d("rtt", String.format("finished wifi ranging. %d/%d ranged successfully", resultMap.size(), rangingResults.size()));
this.lastWifiRangingResults = resultMap;
Log.d("rtt", String.format("finished wifi ranging. %d/%d ranged successfully", lastWifiRangingResults.size(), rangingResults.size()));
pushWifiResultsToApp();
}

Expand Down