[tx-robot] updated from transifex

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Uploader.java

diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index bee9233..f0e0695 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -56,6 +56,8 @@ import android.provider.MediaStore.Video;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;

+import android.support.v7.app.ActionBar;
+import android.view.MenuItem;

 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;


@@ -65,8 +67,6 @@ import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 

-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.view.MenuItem;

 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;


@@ -220,7 +220,8 @@ public class Uploader extends FileActivity
             builder.setPositiveButton(R.string.uploader_wrn_no_account_setup_btn_text, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
             builder.setPositiveButton(R.string.uploader_wrn_no_account_setup_btn_text, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {

-                    if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ECLAIR_MR1) {
+                    if (android.os.Build.VERSION.SDK_INT >
+                            android.os.Build.VERSION_CODES.ECLAIR_MR1) {

                         // using string value since in API7 this
                         // constatn is not defined
                         // in API7 < this constatant is defined in
                         // using string value since in API7 this
                         // constatn is not defined
                         // in API7 < this constatant is defined in


@@ -425,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);


@@ -637,6 +638,7 @@ public class Uploader extends FileActivity
             mParents.add("");
         } else{
             String[] dir_names = last_path.split("/");
             mParents.add("");
         } else{
             String[] dir_names = last_path.split("/");

+            mParents.clear();

             for (String dir : dir_names)
                 mParents.add(dir);
         }
             for (String dir : dir_names)
                 mParents.add(dir);
         }