2 files changed, 18 insertions, 24 deletions

diff --git a/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
index 08c038206..a3652e05d 100644
--- a/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
+++ b/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
@@ -7,7 +7,8 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.OpmlImportActivity;
+import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
+import de.danoeh.antennapod.activity.OpmlImportHolder;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.opml.OpmlElement;
 import de.danoeh.antennapod.storage.DownloadRequestException;
@@ -43,7 +44,7 @@ public class OpmlFeedQueuer extends AsyncTask<Void, Void, Void> {
 	protected Void doInBackground(Void... params) {
 		DownloadRequester requester = DownloadRequester.getInstance();
 		for (int idx = 0; idx < selection.length; idx++) {
-			OpmlElement element = OpmlImportActivity.getReadElements().get(
+			OpmlElement element = OpmlImportHolder.getReadElements().get(
 					selection[idx]);
 			Feed feed = new Feed(element.getXmlUrl(), new Date(),
 					element.getText());
diff --git a/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
index 7498b93de..2c1d30bdb 100644
--- a/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
@@ -1,9 +1,6 @@
 package de.danoeh.antennapod.asynctask;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -26,35 +23,31 @@ public class OpmlImportWorker extends
 	private static final String TAG = "OpmlImportWorker";
 
 	private Context context;
-	private File file; // path to opml file
 	private Exception exception;
 
 	private ProgressDialog progDialog;
 
-	public OpmlImportWorker(Context context, File file) {
-		super();
-		this.context = context;
-		this.file = file;
-	}
+    private Reader mReader;
+
+    public OpmlImportWorker(Context context, Reader reader) {
+        super();
+        this.context = context;
+        this.mReader=reader;
+    }
 
 	@Override
 	protected ArrayList<OpmlElement> doInBackground(Void... params) {
 		if (AppConfig.DEBUG)
 			Log.d(TAG, "Starting background work");
-		FileReader reader = null;
-		// Create reader
-		try {
-			reader = new FileReader(file);
-			if (AppConfig.DEBUG) Log.d(TAG, "Parsing " + file.toString());
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-			exception = e;
-			return null;
-		}
+
+        if (mReader==null) {
+            return null;
+        }
+
 		OpmlReader opmlReader = new OpmlReader();
 		try {
-			ArrayList<OpmlElement> result = opmlReader.readDocument(reader);
-			reader.close();
+            ArrayList<OpmlElement> result = opmlReader.readDocument(mReader);
+			mReader.close();
 			return result;
 		} catch (XmlPullParserException e) {
 			e.printStackTrace();