Fix: Import file from other app shows all folders as TextView

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index a5351f0..0210e17 100644 (file)
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -21,15 +21,28 @@
        android:layout_height="wrap_content" android:orientation="vertical"
        android:layout_width="wrap_content" android:background="#fefefe"
        android:gravity="center">
        android:layout_height="wrap_content" android:orientation="vertical"
        android:layout_width="wrap_content" android:background="#fefefe"
        android:gravity="center">

-       <TextView android:layout_width="fill_parent" android:text="@string/uploader_top_message"
-               android:layout_height="wrap_content" android:id="@+id/drawer_username" android:textColor="@android:color/black"
-               android:gravity="center_horizontal"></TextView>
+
+       <TextView android:layout_width="fill_parent"
+               android:text="@string/uploader_top_message"
+               android:layout_height="wrap_content"
+               android:id="@+id/drawer_username"
+               android:textColor="@android:color/black"
+               android:gravity="center_horizontal">
+       </TextView>
+

        <FrameLayout android:layout_height="fill_parent"
        <FrameLayout android:layout_height="fill_parent"

-               android:layout_width="fill_parent" android:id="@+id/frameLayout1"
-               android:layout_below="@+id/drawer_username" android:layout_above="@+id/linearLayout1">
-               <ListView android:id="@android:id/list" android:layout_width="fill_parent"
-                       android:layout_height="fill_parent" android:divider="@drawable/uploader_list_separator"
-                       android:dividerHeight="1dip"></ListView>
+               android:layout_width="fill_parent"
+               android:id="@+id/frameLayout1"
+               android:layout_below="@+id/drawer_username"
+               android:layout_above="@+id/linearLayout1">
+
+               <ListView android:id="@android:id/list"
+                       android:layout_width="fill_parent"
+                       android:layout_height="fill_parent"
+                       android:divider="@drawable/uploader_list_separator"
+                       android:dividerHeight="1dip">
+               </ListView>
+

        </FrameLayout>
 
        <LinearLayout
        </FrameLayout>
 
        <LinearLayout

diff --git a/res/layout/uploader_list_item_layout.xml b/res/layout/uploader_list_item_layout.xml
index d2d0005..f83608e 100644 (file)
--- a/res/layout/uploader_list_item_layout.xml
+++ b/res/layout/uploader_list_item_layout.xml
@@ -35,7 +35,7 @@
     <TextView 
         android:text="TextView" 
         android:layout_width="fill_parent" 
     <TextView 
         android:text="TextView" 
         android:layout_width="fill_parent" 

-        android:id="@+id/drawer_username" 
+        android:id="@+id/filename"

         android:layout_height="wrap_content" 
         android:textColor="@android:color/black"
                android:layout_gravity="center_vertical"
         android:layout_height="wrap_content" 
         android:textColor="@android:color/black"
                android:layout_gravity="center_vertical"

diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index 533bb99..7bf4218 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -426,7 +426,7 @@ public class Uploader extends FileActivity
                                                 data,
                                                 R.layout.uploader_list_item_layout,
                                                 new String[] {"dirname"},
                                                 data,
                                                 R.layout.uploader_list_item_layout,
                                                 new String[] {"dirname"},

-                                                new int[] {R.id.textView1});
+                                                new int[] {R.id.filename});

             
             mListView.setAdapter(sa);
             Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);
             
             mListView.setAdapter(sa);
             Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);