Feature/cleanup misc (#80)

* fix stream not saved bug

* remove unused rootPath constant from Iperf3Parameter

* fix addTag bug

* fix mqtt multiple client bug

* update Iperf3Parameter and Parameter classes for improved path handling and cleanup

* refactor: update file path methods and clean up unused code

---------

Signed-off-by: PeterHasse <111580770+PeterHasse@users.noreply.github.com>
Co-authored-by: PeterHasse <111580770+PeterHasse@users.noreply.github.com>

Author: hajoha

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/InfluxDB2x/Worker/InfluxDB2xUploadWorker.java

@@ -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);
         }
 

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Inputs/Inputs.java

@@ -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) {

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Fragments/Iperf3Fragment.java

@@ -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();

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3ExecutorWorker.java

@@ -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();

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3MonitorWorker.java

@@ -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);
     }

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3ToLineProtocolWorker.java

@@ -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();
@@ -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());

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Worker/Iperf3UploadWorker.java

@@ -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);
         }
 

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MQTT/Handler/Iperf3Handler.java

@@ -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();
             }

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MQTT/Handler/PingHandler.java

@@ -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();
             }