From 26c1ef30334d41906cb6566832c9f83440f2e60d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Jan 2019 17:11:10 +0100
Subject: [PATCH] move RepoXMLHandler to org.fdroid.fdroid.data

This should be lumped with the classes it uses.
---
 .../java/org/fdroid/fdroid/installer/ApkVerifierTest.java | 2 +-
 app/src/main/java/org/fdroid/fdroid/IndexUpdater.java     | 1 +
 app/src/main/java/org/fdroid/fdroid/data/Apk.java         | 1 -
 .../java/org/fdroid/fdroid/{ => data}/RepoXMLHandler.java | 8 +++-----
 .../fdroid/{updater => data}/RepoXMLHandlerTest.java      | 8 ++------
 .../org/fdroid/fdroid/updater/IndexV1UpdaterTest.java     | 1 +
 .../java/org/fdroid/fdroid/mock/RepoDetails.java          | 2 +-
 7 files changed, 9 insertions(+), 14 deletions(-)
 rename app/src/main/java/org/fdroid/fdroid/{ => data}/RepoXMLHandler.java (98%)
 rename app/src/test/java/org/fdroid/fdroid/{updater => data}/RepoXMLHandlerTest.java (99%)

diff --git a/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java b/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
index fabd5649b..9ee53fcdf 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
@@ -28,7 +28,7 @@ import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
 import org.fdroid.fdroid.AssetUtils;
-import org.fdroid.fdroid.RepoXMLHandler;
+import org.fdroid.fdroid.data.RepoXMLHandler;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.compat.FileCompatTest;
 import org.fdroid.fdroid.data.Apk;
diff --git a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java
index b67b3e908..2b70965b4 100644
--- a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java
+++ b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java
@@ -38,6 +38,7 @@ import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoPersister;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.RepoPushRequest;
+import org.fdroid.fdroid.data.RepoXMLHandler;
 import org.fdroid.fdroid.data.Schema.RepoTable;
 import org.fdroid.fdroid.installer.InstallManagerService;
 import org.fdroid.fdroid.installer.InstallerService;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java
index a4aac393b..78b9e1872 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Apk.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Apk.java
@@ -16,7 +16,6 @@ import android.webkit.MimeTypeMap;
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.fdroid.fdroid.RepoXMLHandler;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
 
diff --git a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
similarity index 98%
rename from app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
rename to app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
index 3da55ec34..1971da4fc 100644
--- a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
@@ -17,15 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.data;
 
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import org.fdroid.fdroid.data.Apk;
-import org.fdroid.fdroid.data.App;
-import org.fdroid.fdroid.data.Repo;
-import org.fdroid.fdroid.data.RepoPushRequest;
+import org.fdroid.fdroid.IndexUpdater;
+import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.ApkTable;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
similarity index 99%
rename from app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java
rename to app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
index a0168659f..fa568a5a5 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
@@ -20,17 +20,13 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.updater;
+package org.fdroid.fdroid.data;
 
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 import org.apache.commons.io.FileUtils;
 import org.fdroid.fdroid.BuildConfig;
-import org.fdroid.fdroid.data.Apk;
-import org.fdroid.fdroid.data.App;
-import org.fdroid.fdroid.data.Repo;
-import org.fdroid.fdroid.data.RepoPushRequest;
 import org.fdroid.fdroid.mock.RepoDetails;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -884,7 +880,7 @@ public class RepoXMLHandlerTest {
     }
 
     @NonNull
-    static RepoDetails getFromFile(ClassLoader classLoader, String indexFilename, int pushRequests) {
+    public static RepoDetails getFromFile(ClassLoader classLoader, String indexFilename, int pushRequests) {
         Log.i(TAG, "test file: " + classLoader.getResource(indexFilename));
         InputStream inputStream = classLoader.getResourceAsStream(indexFilename);
         return RepoDetails.getFromFile(inputStream, pushRequests);
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
index 3ea37db40..c7319b3c0 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
@@ -25,6 +25,7 @@ import org.fdroid.fdroid.data.InstalledAppTestUtils;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.RepoPushRequest;
+import org.fdroid.fdroid.data.RepoXMLHandlerTest;
 import org.fdroid.fdroid.mock.RepoDetails;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java b/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java
index 5778f482c..e17411a41 100644
--- a/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java
+++ b/app/src/testShared/java/org/fdroid/fdroid/mock/RepoDetails.java
@@ -2,7 +2,7 @@ package org.fdroid.fdroid.mock;
 
 import android.support.annotation.NonNull;
 
-import org.fdroid.fdroid.RepoXMLHandler;
+import org.fdroid.fdroid.data.RepoXMLHandler;
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.RepoPushRequest;