From 04db54dfcad948e33bba8802905da5b057730f13 Mon Sep 17 00:00:00 2001
From: Synced Synapse <synced.synapse@gmail.com>
Date: Tue, 31 Mar 2015 00:19:38 +0100
Subject: [PATCH] Fix crash introduced earlier when removing swipe to refresh

---
 .../xbmc/kore/ui/MediaFileListFragment.java   |  3 ++
 .../layout/fragment_generic_media_list.xml    | 30 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
index c4cf1b2..58044c0 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
@@ -22,6 +22,7 @@ import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -88,6 +89,7 @@ public class MediaFileListFragment extends Fragment {
     Queue<FileLocation> mediaQueueFileLocation = new LinkedList<>();
 
     @InjectView(R.id.list) GridView folderGridView;
+    @InjectView(R.id.swipe_refresh_layout) SwipeRefreshLayout swipeRefreshLayout;
     @InjectView(android.R.id.empty) TextView emptyView;
 
     public static MediaFileListFragment newInstance(final String media) {
@@ -127,6 +129,7 @@ public class MediaFileListFragment extends Fragment {
         ButterKnife.inject(this, root);
 
         hostManager = HostManager.getInstance(getActivity());
+        swipeRefreshLayout.setEnabled(false);
 
         emptyView.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/res/layout/fragment_generic_media_list.xml b/app/src/main/res/layout/fragment_generic_media_list.xml
index 228cd9a..515d316 100644
--- a/app/src/main/res/layout/fragment_generic_media_list.xml
+++ b/app/src/main/res/layout/fragment_generic_media_list.xml
@@ -22,18 +22,24 @@
 
     <include layout="@layout/empty_view"/>
 
-    <GridView
-        android:id="@+id/list"
+    <android.support.v4.widget.SwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="@dimen/small_padding"
-        android:paddingRight="@dimen/small_padding"
-        android:paddingTop="@dimen/small_padding"
-        android:paddingBottom="@dimen/default_padding"
-        android:clipToPadding="false"
-        android:choiceMode="none"
-        android:listSelector="?attr/selectableItemBackground"
-        android:drawSelectorOnTop="true"
-        style="@style/Widget.GridView"/>
+        android:layout_height="match_parent">
+        <GridView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/small_padding"
+            android:paddingRight="@dimen/small_padding"
+            android:paddingTop="@dimen/small_padding"
+            android:paddingBottom="@dimen/default_padding"
+            android:clipToPadding="false"
+            android:choiceMode="none"
+            android:listSelector="?attr/selectableItemBackground"
+            android:drawSelectorOnTop="true"
+            style="@style/Widget.GridView"/>
+    </android.support.v4.widget.SwipeRefreshLayout>
 
 </FrameLayout>