From 9e3587c96f3c044e936b98dd665be40de3806d0a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 18 Dec 2014 13:40:09 -0500
Subject: [PATCH] Android: Handle case where core list could not be retrieved
 better

---
 android/phoenix/res/values/strings.xml                |  1 +
 .../fragments/DownloadableCoresFragment.java          | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml
index df1f7fef08..3bdb64f8f8 100644
--- a/android/phoenix/res/values/strings.xml
+++ b/android/phoenix/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="download_core_confirm_title">Confirm</string>
     <string name="download_core_confirm_msg">Are you sure you want to download %1$s?</string>
     <string name="downloading_msg">Downloading %1$s…</string>
+    <string name="download_core_list_error">Error retrieving list of cores.</string>
 
     <!-- Core Downloader - Downloadable Cores Context Menu -->
     <string name="downloadable_cores_ctx_title">Actions</string>
diff --git a/android/phoenix/src/com/retroarch/browser/coremanager/fragments/DownloadableCoresFragment.java b/android/phoenix/src/com/retroarch/browser/coremanager/fragments/DownloadableCoresFragment.java
index afb015e326..c913710a3f 100644
--- a/android/phoenix/src/com/retroarch/browser/coremanager/fragments/DownloadableCoresFragment.java
+++ b/android/phoenix/src/com/retroarch/browser/coremanager/fragments/DownloadableCoresFragment.java
@@ -41,6 +41,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ListView;
+import android.widget.Toast;
 
 import com.retroarch.R;
 
@@ -193,9 +194,7 @@ public final class DownloadableCoresFragment extends ListFragment
 				Log.e("PopulateCoresListOperation", e.getMessage());
 
 				// Make a dummy entry to notify an error.
-				final ArrayList<DownloadableCore> errorList = new ArrayList<DownloadableCore>();
-				errorList.add(new DownloadableCore("Error", e.getMessage()));
-				return errorList;
+				return new ArrayList<DownloadableCore>();
 			}
 		}
 
@@ -203,7 +202,11 @@ public final class DownloadableCoresFragment extends ListFragment
 		protected void onPostExecute(ArrayList<DownloadableCore> result)
 		{
 			super.onPostExecute(result);
-			adapter.addAll(result);
+
+			if (result.isEmpty())
+				Toast.makeText(adapter.getContext(), R.string.download_core_list_error, Toast.LENGTH_SHORT).show();
+			else
+				adapter.addAll(result);
 		}
 
 		// Literally downloads the info file, writes it, and parses it for the corename key/value pair.