From d03b7906f7c582221defc497ba00acde0a9335a7 Mon Sep 17 00:00:00 2001
From: paul-loedige <paul@gve-loedige.de>
Date: Mon, 28 Dec 2020 18:38:37 +0100
Subject: [PATCH] changed the XML up and download to the IO interface as it
 involves communicating with the raspberry

---
 APED/.idea/vcs.xml                                |  1 +
 .../main/java/com/example/aped/MainActivity.java  |  6 +++---
 .../java/com/example/aped/communication/IIO.java  | 15 +++++++++++++++
 .../com/example/aped/communication/TestIO.java    | 13 +++++++++++++
 .../main/java/com/example/aped/utils/IXML.java    | 11 -----------
 .../main/java/com/example/aped/utils/TestXML.java | 10 ----------
 .../java/com/example/aped/utils/XMLHandler.java   | 10 ----------
 7 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/APED/.idea/vcs.xml b/APED/.idea/vcs.xml
index 6c0b863..cff567c 100644
--- a/APED/.idea/vcs.xml
+++ b/APED/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/app/src/main/assets/XML" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java
index ff967c5..fc7c59b 100644
--- a/APED/app/src/main/java/com/example/aped/MainActivity.java
+++ b/APED/app/src/main/java/com/example/aped/MainActivity.java
@@ -106,13 +106,13 @@ public class MainActivity extends AppCompatActivity {
                 break;
 
             case R.id.action_download_xml:
-                if (xml.download() == 0) {
-                    Toast.makeText(this, "Download .xml",
+                if (uebergabe.downloadXML() == 0) {
+                    Toast.makeText(this, "Downloaded .xml",
                         Toast.LENGTH_SHORT).show();
                 }
                 break;
             case R.id.action_upload_xml:
-                if (xml.upload() == 0) {
+                if (uebergabe.uploadXML(new File("")) == 0) {
                     Toast.makeText(this, "Upload .xml",
                         Toast.LENGTH_SHORT).show();
                 }
diff --git a/APED/app/src/main/java/com/example/aped/communication/IIO.java b/APED/app/src/main/java/com/example/aped/communication/IIO.java
index 9c7f5b5..1750374 100644
--- a/APED/app/src/main/java/com/example/aped/communication/IIO.java
+++ b/APED/app/src/main/java/com/example/aped/communication/IIO.java
@@ -1,5 +1,7 @@
 package com.example.aped.communication;
 
+import java.io.File;
+
 public interface IIO
 {
     /**
@@ -16,4 +18,17 @@ public interface IIO
      * @return the value written
      */
     String write(String deviceName, String value);
+
+    /**
+     * uploads the config.xml to the raspberry
+     * @param xmlFile the config.xml
+     * @return 0 if everything worked
+     */
+    int uploadXML(File xmlFile);
+
+    /**
+     * downloads the current config.xml from the raspberry
+     * @return 0 if everything worked
+     */
+    int downloadXML();
 }
diff --git a/APED/app/src/main/java/com/example/aped/communication/TestIO.java b/APED/app/src/main/java/com/example/aped/communication/TestIO.java
index 8976dbb..b1ce57f 100644
--- a/APED/app/src/main/java/com/example/aped/communication/TestIO.java
+++ b/APED/app/src/main/java/com/example/aped/communication/TestIO.java
@@ -4,6 +4,8 @@ import android.widget.Toast;
 
 import com.example.aped.R;
 
+import java.io.File;
+
 public class TestIO implements IIO {
 
     @Override
@@ -27,4 +29,15 @@ public class TestIO implements IIO {
     public String write(String deviceName, String value) {
         return "TRUE";//Wenn erfolgreich gesendet
     }
+
+    @Override
+    public int uploadXML(File xmlFile) {
+        return 0;
+    }
+
+    @Override
+    public int downloadXML() {
+        return 0;
+    }
+
 }
diff --git a/APED/app/src/main/java/com/example/aped/utils/IXML.java b/APED/app/src/main/java/com/example/aped/utils/IXML.java
index 725a6c8..4fc1132 100644
--- a/APED/app/src/main/java/com/example/aped/utils/IXML.java
+++ b/APED/app/src/main/java/com/example/aped/utils/IXML.java
@@ -4,17 +4,6 @@ import java.util.Dictionary;
 import java.util.List;
 
 public interface IXML {
-    /**
-     * downloads the XML from the raspberry to the local folder
-     * @return 0 for no errors
-     */
-    int download();
-
-    /**
-     * uploads the local XML to the raspberry
-     * @return 0 for no errors
-     */
-    int upload();
 
     /**
      * reads the list of available devices from the XML
diff --git a/APED/app/src/main/java/com/example/aped/utils/TestXML.java b/APED/app/src/main/java/com/example/aped/utils/TestXML.java
index 723f494..1179eb8 100644
--- a/APED/app/src/main/java/com/example/aped/utils/TestXML.java
+++ b/APED/app/src/main/java/com/example/aped/utils/TestXML.java
@@ -7,16 +7,6 @@ import java.util.Hashtable;
 import java.util.List;
 
 public class TestXML implements IXML {
-    /** Test Klasse.*/
-    @Override
-    public int download() {
-        return 0;
-    }
-    /** Test Klasse.*/
-    @Override
-    public int upload() {
-        return 0;
-    }
 
     @Override
     public List<String> getDeviceNames() {
diff --git a/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java b/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java
index 1abdda4..ff33357 100644
--- a/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java
+++ b/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java
@@ -46,16 +46,6 @@ public class XMLHandler implements IXML {
         root = builder.parse(xmlFile);
     }
 
-    @Override
-    public int download() {
-        throw new NotImplementedError();
-    }
-
-    @Override
-    public int upload() {
-        throw new NotImplementedError();
-    }
-
     /**
      * reads the device names from the XML file.
      * @return the device names as a list of strings