diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0bc0cc28b..12ffda396 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -175,6 +175,7 @@
android:name="android.app.default_searchable"
android:value=".activity.SearchActivity" />
+
\ No newline at end of file
diff --git a/res/layout-v14/addfeed.xml b/res/layout-v14/addfeed.xml
index 5810288ab..ee8efeaee 100644
--- a/res/layout-v14/addfeed.xml
+++ b/res/layout-v14/addfeed.xml
@@ -21,6 +21,22 @@
android:hint="@string/feedurl_label"
android:inputType="textUri" />
+
+
+
+
+
+
+
+
Sleep timer
Time left:\u0020
Loading categories...
+ Browse Miro Guide
+ Or browse the Miro Guide:
+ Miro Guide
\ No newline at end of file
diff --git a/src/de/danoeh/antennapod/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
index c3d533cdd..19d24c7be 100644
--- a/src/de/danoeh/antennapod/activity/AddFeedActivity.java
+++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
@@ -12,6 +12,7 @@ import android.content.IntentFilter;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
+import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
@@ -37,6 +38,7 @@ public class AddFeedActivity extends SherlockActivity {
private FeedManager manager;
private EditText etxtFeedurl;
+ private Button butBrowseMiroGuide;
private Button butConfirm;
private Button butCancel;
private long downloadId;
@@ -76,9 +78,19 @@ public class AddFeedActivity extends SherlockActivity {
};
etxtFeedurl = (EditText) findViewById(R.id.etxtFeedurl);
+ butBrowseMiroGuide = (Button) findViewById(R.id.butBrowseMiroguide);
butConfirm = (Button) findViewById(R.id.butConfirm);
butCancel = (Button) findViewById(R.id.butCancel);
+ butBrowseMiroGuide.setOnClickListener(new OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(AddFeedActivity.this,
+ MiroGuideMainActivity.class));
+ }
+ });
+
butConfirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -100,13 +112,16 @@ public class AddFeedActivity extends SherlockActivity {
super.onResume();
StorageUtils.checkStorageAvailability(this);
Intent intent = getIntent();
- if (intent.getAction() != null && intent.getAction().equals(Intent.ACTION_SEND)) {
- if (AppConfig.DEBUG) Log.d(TAG, "Was started with ACTION_SEND intent");
+ if (intent.getAction() != null
+ && intent.getAction().equals(Intent.ACTION_SEND)) {
+ if (AppConfig.DEBUG)
+ Log.d(TAG, "Was started with ACTION_SEND intent");
String text = intent.getStringExtra(Intent.EXTRA_TEXT);
if (text != null) {
etxtFeedurl.setText(text);
} else {
- if (AppConfig.DEBUG) Log.d(TAG, "No text was sent");
+ if (AppConfig.DEBUG)
+ Log.d(TAG, "No text was sent");
}
}
@@ -115,7 +130,8 @@ public class AddFeedActivity extends SherlockActivity {
@Override
protected void onStop() {
super.onStop();
- if (AppConfig.DEBUG) Log.d(TAG, "Stopping Activity");
+ if (AppConfig.DEBUG)
+ Log.d(TAG, "Stopping Activity");
}
@Override
diff --git a/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java b/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
index 536b3f433..8284e3c5e 100644
--- a/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
+++ b/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
@@ -56,6 +56,7 @@ public class MiroGuideMainActivity extends SherlockListActivity {
}
}
+ @SuppressLint("NewApi")
private void loadCategories() {
AsyncTask listLoader = new AsyncTask() {
@@ -64,7 +65,7 @@ public class MiroGuideMainActivity extends SherlockListActivity {
@Override
protected void onPostExecute(Void result) {
- if (exception != null) {
+ if (exception == null) {
if (AppConfig.DEBUG) Log.d(TAG, "Successfully loaded categories");
categories = c;
createAdapter();
@@ -79,7 +80,6 @@ public class MiroGuideMainActivity extends SherlockListActivity {
txtvStatus.setText(R.string.loading_categories_label);
}
- @SuppressLint({ "NewApi", "NewApi" })
@Override
protected Void doInBackground(Void... params) {
MiroService service = new MiroService();