Basic video preview in a separate actitivy

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

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 84c8959..f2c36af 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -140,7 +140,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
                 break;
             }
             default:
                 break;
             }
             default:

-                retval = onOptionsItemSelected(item);
+                retval = super.onOptionsItemSelected(item);

         }
         return retval;
     }
         }
         return retval;
     }


@@ -314,14 +314,12 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
         protected Boolean doInBackground(Void... params) {
             String[] checkedFilePaths = mFileListFragment.getCheckedFilePaths();
             long total = 0;
         protected Boolean doInBackground(Void... params) {
             String[] checkedFilePaths = mFileListFragment.getCheckedFilePaths();
             long total = 0;

-            for (int i=0; i < checkedFilePaths.length ; i++) {
+            for (int i=0; checkedFilePaths != null && i < checkedFilePaths.length ; i++) {

                 String localPath = checkedFilePaths[i];
                 File localFile = new File(localPath);
                 total += localFile.length();
             }
                 String localPath = checkedFilePaths[i];
                 File localFile = new File(localPath);
                 total += localFile.length();
             }

-            String savePath = FileStorageUtils.getSavePath(mAccount.name);
-            File saveDir = new File(savePath);
-            return (saveDir.getUsableSpace() >= total);
+            return (FileStorageUtils.getUsableSpace(mAccount.name) >= total);

         }
 
         /**
         }
 
         /**


@@ -365,7 +363,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
             setResult(RESULT_OK_AND_MOVE, data);
             finish();
         }
             setResult(RESULT_OK_AND_MOVE, data);
             finish();
         }

-        //mCurrentDialog.dismiss();
+        mCurrentDialog.dismiss();

         mCurrentDialog = null;
     }
 
         mCurrentDialog = null;
     }
 


@@ -373,7 +371,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
     @Override
     public void onNeutral(String callerTag) {
         Log.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag);
     @Override
     public void onNeutral(String callerTag) {
         Log.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag);

-        //mCurrentDialog.dismiss();
+        mCurrentDialog.dismiss();

         mCurrentDialog = null;
     }
 
         mCurrentDialog = null;
     }
 


@@ -382,7 +380,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
     public void onCancel(String callerTag) {
         /// nothing to do; don't finish, let the user change the selection
         Log.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag);
     public void onCancel(String callerTag) {
         /// nothing to do; don't finish, let the user change the selection
         Log.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag);

-        //mCurrentDialog.dismiss();
+        mCurrentDialog.dismiss();

         mCurrentDialog = null;
     }    
 
         mCurrentDialog = null;
     }