Skip to content

Refactor iPerf3 GUI #14

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

Merged
hajoha merged 6 commits into from
Jun 10, 2024
Merged

Refactor iPerf3 GUI #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d888dec
remove old iPerf3 code, write own parser
hajoha Jun 6, 2024
a66cf02
fix parsing
hajoha Jun 6, 2024
0e47e7a
update JSON parsing
hajoha Jun 7, 2024
658ace0
add JITTER MS and Packet Loss live view
hajoha Jun 7, 2024
2b34573
update JSON parsing
hajoha Jun 10, 2024
d6f1354
remove run config
hajoha Jun 10, 2024
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
19 changes: 19 additions & 0 deletions app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Intervals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package de.fraunhofer.fokus.OpenMobileNetworkToolkit.Iperf3;

import de.fraunhofer.fokus.OpenMobileNetworkToolkit.Iperf3.JSON.Interval.Interval;
import java.util.ArrayList;

public class Intervals {
private ArrayList<Interval> intervals;;

public Intervals(){
this.intervals = new ArrayList<>();
}
public void addInterval(Interval interval){
intervals.add(interval);
}
public ArrayList<Interval> getIntervalArrayList(){
return intervals;
}

}
17 changes: 4 additions & 13 deletions app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Iperf3Fragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public class Iperf3Fragment extends Fragment {
private final String IPERF3CPORT = "iperf3cport";
private CheckBox iperf3BiDir;
private CheckBox iperf3Reverse;
private CheckBox iperf3Json;

private CheckBox iperf3OneOff;
private EditText iperf3EtIp;
private EditText iperf3EtPort;
Expand Down Expand Up @@ -169,7 +169,6 @@ public void onChanged(String s) {

iperf3Reverse.setChecked(iperf3RunResult.input.iperf3Reverse);
iperf3BiDir.setChecked(iperf3RunResult.input.iperf3BiDir);
iperf3Json.setChecked(iperf3RunResult.input.iperf3Json);
iperf3OneOff.setChecked(iperf3RunResult.input.iperf3OneOff);
protocolSpinner.setSelection(iperf3RunResult.input.iperf3IdxProtocol);
iperf3ModeSpinner.setSelection(iperf3RunResult.input.iperf3IdxMode);
Expand Down Expand Up @@ -304,12 +303,10 @@ public void afterTextChanged(Editable s) {

iperf3BiDir = v.findViewById(R.id.iperf_bidir);
iperf3Reverse = v.findViewById(R.id.iperf3_reverse);
iperf3Json = v.findViewById(R.id.iperf3_json);
iperf3OneOff = v.findViewById(R.id.iperf3_one_off);

saveCheckboxInputToSharedPreferences(iperf3BiDir, IPERF3BIDIR);
saveCheckboxInputToSharedPreferences(iperf3Reverse, IPERF3REVERSE);
saveCheckboxInputToSharedPreferences(iperf3Json, IPERF3JSON);
saveCheckboxInputToSharedPreferences(iperf3OneOff, IPERF3ONEOFF);

protocolSpinner = v.findViewById(R.id.iperf3_protocol_spinner);
Expand Down Expand Up @@ -352,7 +349,6 @@ public void onFragmentResult(@NonNull String requestKey,

iperf3Reverse.setChecked(iperf3RunResult.input.iperf3Reverse);
iperf3BiDir.setChecked(iperf3RunResult.input.iperf3BiDir);
iperf3Json.setChecked(iperf3RunResult.input.iperf3Json);
iperf3OneOff.setChecked(iperf3RunResult.input.iperf3OneOff);
protocolSpinner.setSelection(iperf3RunResult.input.iperf3IdxProtocol);
iperf3ModeSpinner.setSelection(iperf3RunResult.input.iperf3IdxMode);
Expand All @@ -375,7 +371,6 @@ public void onFragmentResult(@NonNull String requestKey,
iperf3BiDir.setChecked(savedInstanceState.getBoolean(IPERF3BIDIR));

iperf3Reverse.setChecked(savedInstanceState.getBoolean(IPERF3REVERSE));
iperf3Json.setChecked(savedInstanceState.getBoolean(IPERF3JSON));
iperf3OneOff.setChecked(savedInstanceState.getBoolean(IPERF3ONEOFF));
protocolSpinner.setSelection(savedInstanceState.getInt(IPERF3IDXPROTOCOL));
iperf3ModeSpinner.setSelection(savedInstanceState.getInt(IPERF3IDXMODE));
Expand All @@ -391,7 +386,6 @@ public void onFragmentResult(@NonNull String requestKey,

iperf3BiDir.setChecked(preferences.getBoolean(IPERF3BIDIR, false));
iperf3Reverse.setChecked(preferences.getBoolean(IPERF3REVERSE, false));
iperf3Json.setChecked(preferences.getBoolean(IPERF3JSON, false));
iperf3OneOff.setChecked(preferences.getBoolean(IPERF3ONEOFF, false));
protocolSpinner.setSelection(preferences.getInt(IPERF3IDXPROTOCOL, 0));
iperf3ModeSpinner.setSelection(preferences.getInt(IPERF3IDXMODE, 0));
Expand Down Expand Up @@ -630,7 +624,7 @@ private String parseInput() {
input.iperf3BiDir = false;
input.iperf3Reverse = false;
input.iperf3OneOff = false;
input.iperf3Json = false;
input.iperf3Json = true;

if (!isModeSpinnerClient()) {
stb.add("-s");
Expand All @@ -648,10 +642,8 @@ private String parseInput() {
stb.add("--one-off");
input.iperf3OneOff = true;
}
if (iperf3Json.isChecked()) {
stb.add("--json");
input.iperf3Json = true;
}
stb.add("--json-stream");


String joined = String.join(" ", stb);

Expand Down Expand Up @@ -682,7 +674,6 @@ private void writeToSP() {

editor.putBoolean(IPERF3BIDIR, iperf3BiDir.isChecked());
editor.putBoolean(IPERF3REVERSE, iperf3Reverse.isChecked());
editor.putBoolean(IPERF3JSON, iperf3Json.isChecked());
editor.putBoolean(IPERF3ONEOFF, iperf3OneOff.isChecked());
editor.apply();
}
Expand Down
Loading