new icons, new uploader

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index b87fd1d..46e9be9 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,6 +18,9 @@
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
+import java.io.File;\r
+import java.net.URLEncoder;\r
+\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
@@ -55,8 +58,10 @@ import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
+import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.syncadapter.FileSyncService;\r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
+import eu.alefzero.owncloud.utils.OwnCloudVersion;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
@@ -164,6 +169,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                \r
                requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
     setProgressBarIndeterminateVisibility(false);\r
+    //if (getSupportFragmentManager().findFragmentById(R.id.fileList) == null)\r
+      setContentView(R.layout.files);\r
+    \r
        }\r
 \r
        @Override\r
@@ -245,8 +253,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
           IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
           syncBroadcastRevceiver = new  SyncBroadcastReceiver();\r
           registerReceiver(syncBroadcastRevceiver, f);\r
-          if (getSupportFragmentManager().findFragmentById(R.id.fileList) == null)\r
-            setContentView(R.layout.files);\r
           \r
           mDirectories = new CustomArrayAdapter<String>(this,\r
                R.layout.sherlock_spinner_dropdown_item);\r
@@ -261,28 +267,40 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        }\r
            \r
         public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
+          Log.e("ASD", requestCode + " " + resultCode);\r
      if (resultCode == RESULT_OK) {\r
          if (requestCode == ACTION_SELECT_FILE) {\r
-             Uri selectedImageUri = data.getData();\r
-\r
-             String filemanagerstring = selectedImageUri.getPath();\r
-\r
-             String selectedImagePath = getPath(selectedImageUri);\r
-\r
-             //DEBUG PURPOSE - you can delete this if you want\r
-             if(selectedImagePath!=null)\r
-                 System.out.println(selectedImagePath);\r
-             else System.out.println("selectedImagePath is null");\r
-             if(filemanagerstring!=null)\r
-                 System.out.println(filemanagerstring);\r
-             else System.out.println("filemanagerstring is null");\r
-\r
-             //NOW WE HAVE OUR WANTED STRING\r
-             if(selectedImagePath!=null)\r
-                 System.out.println("selectedImagePath is the right one for you!");\r
-             else\r
-                 System.out.println("filemanagerstring is the right one for you!");\r
+           Uri selectedImageUri = data.getData();\r
+\r
+           String filemanagerstring = selectedImageUri.getPath();\r
+           String selectedImagePath = getPath(selectedImageUri);\r
+           String filepath;\r
+\r
+           if(selectedImagePath!=null)\r
+               filepath = selectedImagePath;\r
+           else\r
+               filepath = filemanagerstring;\r
+             \r
+         if (filepath == null) {\r
+           Log.e("FileDisplay", "Couldnt resolve path to file");\r
+           return;\r
          }\r
+         \r
+         Intent i = new Intent(this, FileUploader.class);\r
+         i.putExtra(FileUploader.KEY_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+         String remotepath = new String();\r
+         for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
+           remotepath += "/" + mDirectories.getItem(j);\r
+         }\r
+         if (!remotepath.endsWith("/")) remotepath += "/";\r
+         remotepath += new File(filepath).getName();\r
+         Log.e("ASD", remotepath+"");\r
+         \r
+         i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
+         i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
+         i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
+         startService(i);\r
+       }\r
      }\r
         }\r
         \r
@@ -291,8 +309,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        Cursor cursor = managedQuery(uri, projection, null, null, null);\r
        if(cursor!=null)\r
        {\r
-           //HERE YOU WILL GET A NULLPOINTER IF CURSOR IS NULL\r
-           //THIS CAN BE, IF YOU USED OI FILE MANAGER FOR PICKING THE MEDIA\r
            int column_index = cursor\r
            .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);\r
            cursor.moveToFirst();\r