From 3ca061bd7615af04a62691c333c394dddb68b31b Mon Sep 17 00:00:00 2001
From: Matthias Mueller <thias15@web.de>
Date: Mon, 20 Sep 2021 12:54:47 +0200
Subject: [PATCH] fix upload bug

---
 .../main/java/org/openbot/common/ControlsFragment.java |  3 ++-
 .../main/java/org/openbot/logging/LoggerFragment.java  | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/java/org/openbot/common/ControlsFragment.java b/android/app/src/main/java/org/openbot/common/ControlsFragment.java
index df700943c..93b4ad165 100644
--- a/android/app/src/main/java/org/openbot/common/ControlsFragment.java
+++ b/android/app/src/main/java/org/openbot/common/ControlsFragment.java
@@ -59,7 +59,8 @@ public abstract class ControlsFragment extends Fragment implements ServerListene
   protected final String voice = "matthew";
   protected List<Model> masterList;
 
-  private ServerCommunication serverCommunication;
+  protected ServerCommunication serverCommunication;
+
   private ArrayAdapter<String> modelAdapter;
   private ArrayAdapter<String> serverAdapter;
   private Spinner modelSpinner;
diff --git a/android/app/src/main/java/org/openbot/logging/LoggerFragment.java b/android/app/src/main/java/org/openbot/logging/LoggerFragment.java
index 06effd098..eb79a3d20 100644
--- a/android/app/src/main/java/org/openbot/logging/LoggerFragment.java
+++ b/android/app/src/main/java/org/openbot/logging/LoggerFragment.java
@@ -39,7 +39,6 @@
 import org.openbot.databinding.FragmentLoggerBinding;
 import org.openbot.env.BotToControllerEventBus;
 import org.openbot.env.ImageUtils;
-import org.openbot.server.ServerCommunication;
 import org.openbot.tflite.Model;
 import org.openbot.utils.ConnectionUtils;
 import org.openbot.utils.Constants;
@@ -55,7 +54,6 @@ public class LoggerFragment extends CameraFragment {
   private Handler handler;
   private HandlerThread handlerThread;
   private Intent intentSensorService;
-  private ServerCommunication serverCommunication;
   protected String logFolder;
 
   protected boolean loggingEnabled;
@@ -292,11 +290,11 @@ private void stopLogging() {
     // Pack and upload the collected data
     runInBackground(
         () -> {
-          String logZipFile = logFolder + ".zip";
-          // Zip the log folder and then delete it
-          File folder = new File(logFolder);
-          File zip = new File(logZipFile);
           try {
+            String logZipFile = logFolder + ".zip";
+            // Zip the log folder and then delete it
+            File folder = new File(logFolder);
+            File zip = new File(logZipFile);
             TimeUnit.MILLISECONDS.sleep(500);
             // These two lines below are messy and may cause bugs. needs to be looked into
             ZipUtil.pack(folder, zip);