From c2734ecb7e8d1aa09546cdbb2c2d62fa35709cb2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 20 Mar 2020 14:12:01 +0100
Subject: [PATCH 1/2] Fixed adding feeds when clipboard is empty

---
 .../java/de/danoeh/antennapod/fragment/AddFeedFragment.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index 8f6f4d964..2d2244a85 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -76,9 +76,9 @@ public class AddFeedFragment extends Fragment {
         EditText editText = content.findViewById(R.id.text);
         editText.setHint(R.string.add_podcast_by_url_hint);
         ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-        String clipboardContent = clipboard.getText().toString();
-        if (clipboardContent.startsWith("http")) {
-            editText.setText(clipboardContent);
+        String clipboardContent = clipboard.getText() != null ? clipboard.getText().toString() : "";
+        if (clipboardContent.trim().startsWith("http")) {
+            editText.setText(clipboardContent.trim());
         }
         builder.setView(content);
         builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> addUrl(editText.getText().toString()));

From 096fb0d427b8c815a9ebc3f6db74e516b65fbebb Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 20 Mar 2020 14:17:53 +0100
Subject: [PATCH 2/2] Fixed back button no longer closing app

---
 .../java/de/test/antennapod/ui/MainActivityTest.java   |  2 ++
 .../de/danoeh/antennapod/activity/MainActivity.java    |  1 +
 .../danoeh/antennapod/fragment/NavDrawerFragment.java  | 10 +++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index 72e4c29d9..48bdf4dd4 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -101,6 +101,8 @@ public class MainActivityTest {
         solo.goBack();
         solo.goBack();
         assertEquals(solo.getString(R.string.subscriptions_label), getActionbarTitle());
+        solo.goBack();
+        assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
     }
 
     @Test
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 9ec043828..6dab5ab45 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -367,6 +367,7 @@ public class MainActivity extends CastEnabledActivity {
                         super.onBackPressed();
                     } else {
                         loadFragment(UserPreferences.getBackButtonGoToPage(), null);
+                        NavDrawerFragment.saveLastNavFragment(this, UserPreferences.getBackButtonGoToPage());
                     }
                     break;
                 default: super.onBackPressed();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
index b3492d79c..63969345c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
@@ -192,7 +192,7 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
                             } else {
                                 showMainActivity(EpisodesFragment.TAG);
                             }
-                            saveLastNavFragment(EpisodesFragment.TAG);
+                            saveLastNavFragment(getContext(), EpisodesFragment.TAG);
                         }
                     }
                 };
@@ -371,7 +371,7 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
                 } else {
                     showMainActivity(tag);
                 }
-                saveLastNavFragment(tag);
+                saveLastNavFragment(getContext(), tag);
             } else {
                 int pos = position - navAdapter.getSubscriptionOffset();
                 long feedId = navDrawerData.feeds.get(pos).getId();
@@ -382,7 +382,7 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
                     intent.putExtra(MainActivity.EXTRA_FEED_ID, feedId);
                     startActivity(intent);
                 }
-                saveLastNavFragment(String.valueOf(feedId));
+                saveLastNavFragment(getContext(), String.valueOf(feedId));
             }
             selectedNavListIndex = position;
             navAdapter.notifyDataSetChanged();
@@ -400,9 +400,9 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
         }
     }
 
-    private void saveLastNavFragment(String tag) {
+    public static void saveLastNavFragment(Context context, String tag) {
         Log.d(TAG, "saveLastNavFragment(tag: " + tag + ")");
-        SharedPreferences prefs = getContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
         SharedPreferences.Editor edit = prefs.edit();
         if (tag != null) {
             edit.putString(PREF_LAST_FRAGMENT_TAG, tag);