Skip to content

Feature/cleanup misc #80

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
PeterHasse merged 11 commits into from
Nov 25, 2025
Merged

Feature/cleanup misc #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0cf2b17
fix stream not saved bug
hajoha Aug 15, 2025
3f635b2
remove unused rootPath constant from Iperf3Parameter
hajoha Nov 25, 2025
770d9aa
fix addTag bug
hajoha Oct 12, 2025
7ef436f
fix mqtt multiple client bug
hajoha Sep 12, 2025
8cb6808
update Iperf3Parameter and Parameter classes for improved path handli…
hajoha Nov 25, 2025
fa21c43
Merge branch 'fix/iperf3-streams' into foobar
hajoha Nov 25, 2025
2641f54
Merge branch 'fix/ping-tag-bug' into foobar
hajoha Nov 25, 2025
61d9cb9
Merge branch 'feature/mqtt-core' into foobar
hajoha Nov 25, 2025
377044e
Merge branch 'refs/heads/foobar' into feature/cleanup-misc
hajoha Nov 25, 2025
75a193a
refactor: update file path methods and clean up unused code
hajoha Nov 25, 2025
d4d56fe
Merge branch 'rel/0.7' into feature/cleanup-misc
PeterHasse Nov 25, 2025
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
6 changes: 3 additions & 3 deletions ...e/fraunhofer/fokus/OpenMobileNetworkToolkit/InfluxDB2x/Worker/InfluxDB2xUploadWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ public Result doWork() {
}
BufferedReader br;
try {
br = new BufferedReader(new FileReader(input.getParameter().getLineProtocolFile()));
br = new BufferedReader(new FileReader(input.getParameter().getLineProtocolFilePath()));
} catch (FileNotFoundException | NullPointerException e) {
Log.d(TAG,e.toString());
return Result.failure(output);
}
List<String> points = br.lines().collect(Collectors.toList());
try {
Log.d(TAG, String.format("doWork: uploading %s", input.getParameter().getLineProtocolFile()));
Log.d(TAG, String.format("doWork: uploading %s", input.getParameter().getLineProtocolFilePath()));
influx.writeRecords(points);
} catch (IOException e) {
Log.d(TAG, String.format("doWork: upload of %s failed!", input.getParameter().getLineProtocolFile()));
Log.d(TAG, String.format("doWork: upload of %s failed!", input.getParameter().getLineProtocolFilePath()));
return Result.failure(output);
}

Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Inputs/Inputs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(sequenceUUID);
dest.writeString(measurementUUID);
dest.writeString(testUUID);
dest.writeParcelable(parameter, flags);
}

public Data.Builder getInputAsDataBuilder(int i, String packageName) {
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Fragments/Iperf3Fragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ public void onClick(View view) {
iperf3Input.getParameter().updatePaths();
iperf3Input.setTimestamp(new Timestamp(System.currentTimeMillis()));

File logFile = new File(iperf3Input.getParameter().getLogfile());
File rawPath = new File(Iperf3Parameter.rawDirPath);
File logFile = new File(iperf3Input.getParameter().getRawLogFilePath());
File rawPath = new File(iperf3Input.getParameter().getRawDirPath());

if(!rawPath.exists()) {
rawPath.mkdirs();
Expand Down
4 changes: 2 additions & 2 deletions ...java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3ExecutorWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public Iperf3ExecutorWorker(@NonNull Context context, @NonNull WorkerParameters
public ListenableFuture<Result> startRemoteWork() {
return CallbackToFutureAdapter.getFuture(completer -> {
Log.d(TAG, "startRemoteWork: tags: "+this.getTags());
File logFile = new File(iperf3Input.getParameter().getLogfile());
File rawPath = new File(Iperf3Parameter.rawDirPath);
File logFile = new File(iperf3Input.getParameter().getRawLogFilePath());
File rawPath = new File(iperf3Input.getParameter().getRawDirPath());

if(!rawPath.exists()) {
rawPath.mkdirs();
Expand Down
2 changes: 1 addition & 1 deletion .../java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3MonitorWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public Iperf3MonitorWorker(@NonNull Context context, @NonNull WorkerParameters w
notificationLayout.setViewVisibility(R.id.notification_direction, GONE);
setForegroundAsync(createForegroundInfo(notificationLayout));

this.pathToFile = iperf3Input.getParameter().getLogfile();
this.pathToFile = iperf3Input.getParameter().getRawLogFilePath();
Log.d(TAG, "Iperf3MonitorWorker: pathToFile: "+this.pathToFile);
this.file = new File(this.pathToFile);
}
Expand Down
6 changes: 3 additions & 3 deletions ...e/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3ToLineProtocolWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ public Result doWork() {
}

}
File path = new File(Iperf3Parameter.lineProtocolDirPath);
File path = new File(iperf3Input.getParameter().getRawDirPath());
if(!path.exists()){
path.mkdirs();
}
File iperf3File = new File(iperf3Input.getParameter().getLineProtocolFile());
File iperf3File = new File(iperf3Input.getParameter().getLineProtocolDirPath());
if (!iperf3File.exists()) {
try {
iperf3File.createNewFile();
Expand All @@ -201,7 +201,7 @@ public Result doWork() {

FileOutputStream iperf3Stream = null;
try {
iperf3Stream = new FileOutputStream(iperf3Input.getParameter().getLineProtocolFile(), true);
iperf3Stream = new FileOutputStream(iperf3Input.getParameter().getLineProtocolDirPath(), true);
} catch (FileNotFoundException e) {
Toast.makeText(getApplicationContext(), "logfile not created", Toast.LENGTH_SHORT).show();
Log.d(TAG,e.toString());
Expand Down
6 changes: 3 additions & 3 deletions ...n/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3UploadWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ public Result doWork() {
}
BufferedReader br;
try {
br = new BufferedReader(new FileReader(iperf3Input.getParameter().getLineProtocolFile()));
br = new BufferedReader(new FileReader(iperf3Input.getParameter().getLineProtocolFilePath()));
} catch (FileNotFoundException | NullPointerException e) {
Log.d(TAG,e.toString());
return Result.failure(output);
}
List<String> points = br.lines().collect(Collectors.toList());
try {
Log.d(TAG, String.format("doWork: uploading %s", iperf3Input.getParameter().getLineProtocolFile()));
Log.d(TAG, String.format("doWork: uploading %s", iperf3Input.getParameter().getLineProtocolFilePath()));
influx.writeRecords(points);
} catch (IOException e) {
Log.d(TAG, String.format("doWork: upload of %s failed!", iperf3Input.getParameter().getLineProtocolFile()));
Log.d(TAG, String.format("doWork: upload of %s failed!", iperf3Input.getParameter().getLineProtocolFilePath()));
return Result.failure(output);
}

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MQTT/Handler/Iperf3Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void parsePayload(String payload) throws JSONException {

Iperf3RunResult iperf3RunResult = new Iperf3RunResult(iperf3Input.getTestUUID(), -100, false, iperf3Input, new java.sql.Timestamp(System.currentTimeMillis()));
iperf3RunResultDao.insert(iperf3RunResult);
File logFile = new File(iperf3Input.getParameter().getLogfile());
File logFile = new File(iperf3Input.getParameter().getRawLogFilePath());
if(logFile.exists()) {
logFile.delete();
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MQTT/Handler/PingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void parsePayload(String payload) throws JSONException {
PingParameter pingParameter = new PingParameter(params, testUUID);
if(pingParameter == null) continue;
PingInput pingInput = new PingInput(pingParameter, testUUID, sequenceUUID, measurementUUUID,campaignUUID);
File logFile = new File(pingInput.getParameter().getLogfile());
File logFile = new File(pingInput.getParameter().getLineProtocolFilePath());
if(logFile.exists()) {
logFile.delete();
}
Expand Down
Loading