diff options
Diffstat (limited to 'src/de/danoeh/antennapod/activity')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/AddFeedActivity.java | 2 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java | 4 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java (renamed from src/de/danoeh/antennapod/activity/OpmlImportActivity.java) | 13 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/activity/OpmlImportHolder.java | 29 |
4 files changed, 36 insertions, 12 deletions
diff --git a/src/de/danoeh/antennapod/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java index e90387cd3..44486b5ef 100644 --- a/src/de/danoeh/antennapod/activity/AddFeedActivity.java +++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java @@ -73,7 +73,7 @@ public class AddFeedActivity extends SherlockActivity { @Override public void onClick(View v) { startActivity(new Intent(AddFeedActivity.this, - OpmlImportActivity.class)); + OpmlImportFromPathActivity.class)); } }); diff --git a/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java index 582673dbb..2301d2f0f 100644 --- a/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java +++ b/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java @@ -90,8 +90,8 @@ public class OpmlFeedChooserActivity extends SherlockActivity { private List<String> getTitleList() { List<String> result = new ArrayList<String>(); - if (OpmlImportActivity.getReadElements() != null) { - for (OpmlElement element : OpmlImportActivity.getReadElements()) { + if (OpmlImportHolder.getReadElements() != null) { + for (OpmlElement element : OpmlImportHolder.getReadElements()) { result.add(element.getText()); } diff --git a/src/de/danoeh/antennapod/activity/OpmlImportActivity.java b/src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java index 5ec2e8538..a02f0e67f 100644 --- a/src/de/danoeh/antennapod/activity/OpmlImportActivity.java +++ b/src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java @@ -27,7 +27,7 @@ import de.danoeh.antennapod.opml.OpmlElement; import de.danoeh.antennapod.util.StorageUtils; /** Lets the user start the OPML-import process. */ -public class OpmlImportActivity extends SherlockActivity { +public class OpmlImportFromPathActivity extends SherlockActivity { private static final String TAG = "OpmlImportActivity"; public static final String IMPORT_DIR = "import/"; @@ -38,8 +38,6 @@ public class OpmlImportActivity extends SherlockActivity { private OpmlImportWorker importWorker; - private static ArrayList<OpmlElement> readElements; - @Override protected void onCreate(Bundle savedInstanceState) { setTheme(PodcastApp.getThemeResourceId()); @@ -144,9 +142,9 @@ public class OpmlImportActivity extends SherlockActivity { if (result != null) { if (AppConfig.DEBUG) Log.d(TAG, "Parsing was successful"); - readElements = result; + OpmlImportHolder.setReadElements(result); startActivityForResult(new Intent( - OpmlImportActivity.this, + OpmlImportFromPathActivity.this, OpmlFeedChooserActivity.class), 0); } else { if (AppConfig.DEBUG) @@ -211,7 +209,7 @@ public class OpmlImportActivity extends SherlockActivity { @Override protected void onPostExecute(Void result) { super.onPostExecute(result); - Intent intent = new Intent(OpmlImportActivity.this, MainActivity.class); + Intent intent = new Intent(OpmlImportFromPathActivity.this, MainActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); @@ -226,8 +224,5 @@ public class OpmlImportActivity extends SherlockActivity { } } - public static ArrayList<OpmlElement> getReadElements() { - return readElements; - } } diff --git a/src/de/danoeh/antennapod/activity/OpmlImportHolder.java b/src/de/danoeh/antennapod/activity/OpmlImportHolder.java new file mode 100644 index 000000000..ec53ed7b6 --- /dev/null +++ b/src/de/danoeh/antennapod/activity/OpmlImportHolder.java @@ -0,0 +1,29 @@ +package de.danoeh.antennapod.activity; + +import de.danoeh.antennapod.opml.OpmlElement; + +import java.util.ArrayList; + +/** + * Hold infos gathered by Ompl-Import + * <p/> + * Created with IntelliJ IDEA. + * User: ligi + * Date: 1/23/13 + * Time: 2:15 PM + */ +public class OpmlImportHolder { + + private static ArrayList<OpmlElement> readElements; + + public static ArrayList<OpmlElement> getReadElements() { + return readElements; + } + + public static void setReadElements(ArrayList<OpmlElement> _readElements) { + readElements = _readElements; + } + + +} + |