Added upload operation to sample oc_framework client

diff --git a/oc_framework/sample_client/assets/oc_sample.png b/oc_framework/sample_client/assets/oc_sample.png
new file mode 100644 (file)
index 0000000..31a346c
Binary files /dev/null and b/oc_framework/sample_client/assets/oc_sample.png differ

diff --git a/oc_framework/sample_client/res/layout/main.xml b/oc_framework/sample_client/res/layout/main.xml
index d29d25c..f09239f 100644 (file)
--- a/oc_framework/sample_client/res/layout/main.xml
+++ b/oc_framework/sample_client/res/layout/main.xml
@@ -33,8 +33,20 @@
         android:onClick="onClickHandler" 
         />
 
         android:onClick="onClickHandler" 
         />
 

+    <TextView
+        android:id="@+id/upload_progress"
+        style="@style/ProgressStyle"
+        android:layout_below="@id/list_view"
+        android:layout_above="@id/frame"
+        android:layout_toRightOf="@id/button_upload"
+        android:layout_toLeftOf="@+id/button_delete_remote"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:text="0%"
+        />
+

     <Button
     <Button

-        android:id="@+id/button_delete_remote"
+        android:id="@id/button_delete_remote"

         style="@style/ButtonStyle"
         android:layout_alignParentRight="true"
         android:layout_above="@id/frame"
         style="@style/ButtonStyle"
         android:layout_alignParentRight="true"
         android:layout_above="@id/frame"


@@ -61,8 +73,20 @@
         android:onClick="onClickHandler" 
         />
 
         android:onClick="onClickHandler" 
         />
 

+    <TextView
+        android:id="@+id/download_progress"
+        style="@style/ProgressStyle"
+        android:layout_below="@id/frame"
+        android:layout_alignParentBottom="true"
+        android:layout_toRightOf="@id/button_download"
+        android:layout_toLeftOf="@+id/button_delete_local"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:text="0%"
+        />
+

     <Button
     <Button

-        android:id="@+id/button_delete_local"
+        android:id="@id/button_delete_local"

         style="@style/ButtonStyle"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         style="@style/ButtonStyle"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"

diff --git a/oc_framework/sample_client/res/values-v11/styles.xml b/oc_framework/sample_client/res/values-v11/styles.xml
index c928a35..c1efd6d 100644 (file)
--- a/oc_framework/sample_client/res/values-v11/styles.xml
+++ b/oc_framework/sample_client/res/values-v11/styles.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ButtonStyle" parent="@android:style/Widget.Holo.Button">
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ButtonStyle" parent="@android:style/Widget.Holo.Button">

-        <item name="android:layout_width">160dp</item>
+        <item name="android:layout_width">120dp</item>

         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>

-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+    <style name="ProgressStyle" parent="@android:style/Widget.Holo.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">12sp</item>

     </style>
 </resources>
\ No newline at end of file
     </style>
 </resources>
\ No newline at end of file

diff --git a/oc_framework/sample_client/res/values/dimensions.xml b/oc_framework/sample_client/res/values/dimensions.xml
index 224b59a..cf47cc4 100644 (file)
--- a/oc_framework/sample_client/res/values/dimensions.xml
+++ b/oc_framework/sample_client/res/values/dimensions.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <dimen name="frame_height">160dp</dimen>
+    <dimen name="frame_height">120dp</dimen>

 </resources>
\ No newline at end of file
 </resources>
\ No newline at end of file

diff --git a/oc_framework/sample_client/res/values/strings.xml b/oc_framework/sample_client/res/values/strings.xml
index a3b69ed..56f9580 100644 (file)
--- a/oc_framework/sample_client/res/values/strings.xml
+++ b/oc_framework/sample_client/res/values/strings.xml
@@ -13,5 +13,9 @@
        <string name="todo_start_download">TODO: start download</string>    
     <string name="todo_start_local_deletion">TODO: start local deletion</string>
     <string name="todo_operation_finished_in_success">TODO: operation finished in success</string>    
        <string name="todo_start_download">TODO: start download</string>    
     <string name="todo_start_local_deletion">TODO: start local deletion</string>
     <string name="todo_operation_finished_in_success">TODO: operation finished in success</string>    

-    <string name="todo_operation_finished_in_fail">TODO: operation finished in fail</string>    
+    <string name="todo_operation_finished_in_fail">TODO: operation finished in fail</string>
+    <string name="upload_folder_path">to_upload</string>
+    <string name="error_copying_sample_file">Sample file could not be saved in temporal folder; upload will not work</string>
+    <string name="sample_file_name">oc_sample.png</string>    
+    <string name="sample_file_mimetype">image/png</string>    

 </resources>
 </resources>

diff --git a/oc_framework/sample_client/res/values/styles.xml b/oc_framework/sample_client/res/values/styles.xml
index 9db99c2..79978e7 100644 (file)
--- a/oc_framework/sample_client/res/values/styles.xml
+++ b/oc_framework/sample_client/res/values/styles.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ButtonStyle" parent="@android:style/Widget.Button">
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ButtonStyle" parent="@android:style/Widget.Button">

-        <item name="android:layout_width">160dp</item>
+        <item name="android:layout_width">120dp</item>

         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>

-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+    <style name="ProgressStyle" parent="@android:style/Widget.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">12sp</item>

     </style>
 </resources>
\ No newline at end of file
     </style>
 </resources>
\ No newline at end of file

diff --git a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java b/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java
index e457793..75d0d76 100644 (file)
--- a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java
+++ b/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java
@@ -1,8 +1,13 @@
 package com.owncloud.android.oc_framework.sampleclient;
 
 package com.owncloud.android.oc_framework.sampleclient;
 

+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;

 import java.util.List;
 
 import com.owncloud.android.oc_framework.accounts.AccountUtils;
 import java.util.List;
 
 import com.owncloud.android.oc_framework.accounts.AccountUtils;

+import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;

 import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
 import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
 import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
 import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;


@@ -10,17 +15,23 @@ import com.owncloud.android.oc_framework.operations.RemoteFile;
 import com.owncloud.android.oc_framework.operations.RemoteOperation;
 import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
 import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
 import com.owncloud.android.oc_framework.operations.RemoteOperation;
 import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
 import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;

+import com.owncloud.android.oc_framework.operations.remote.UploadRemoteFileOperation;

 import com.owncloud.android.oc_framework.utils.FileUtils;
 
 import android.app.Activity;
 import com.owncloud.android.oc_framework.utils.FileUtils;
 
 import android.app.Activity;

+import android.content.res.AssetManager;

 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;

+import android.util.Log;

 import android.view.View;
 import android.widget.ListView;
 import android.view.View;
 import android.widget.ListView;

+import android.widget.TextView;

 import android.widget.Toast;
 
 import android.widget.Toast;
 

-public class MainActivity extends Activity implements OnRemoteOperationListener {
+public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
+       
+       private static String LOG_TAG = MainActivity.class.getCanonicalName();  

        
        private Handler mHandler;
        
        
        private Handler mHandler;
        


@@ -42,8 +53,40 @@ public class MainActivity extends Activity implements OnRemoteOperationListener
        
        mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
        ((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
        
        mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
        ((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);

+       
+       // TODO move to background thread or task
+       AssetManager assets = getAssets();
+               try {
+                       String sampleFileName = getString(R.string.sample_file_name); 
+               File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+               upFolder.mkdir();
+               File upFile = new File(upFolder, sampleFileName);
+               FileOutputStream fos = new FileOutputStream(upFile);
+               InputStream is = assets.open(sampleFileName);
+               int count = 0;
+               byte[] buffer = new byte[1024];
+               while ((count = is.read(buffer, 0, buffer.length)) >= 0) {
+                       fos.write(buffer, 0, count);
+               }
+               is.close();
+               fos.close();
+               } catch (IOException e) {
+                       Toast.makeText(this, R.string.error_copying_sample_file, Toast.LENGTH_SHORT).show();
+                       Log.e(LOG_TAG, getString(R.string.error_copying_sample_file), e);
+               }
+    }
+    
+    
+    @Override
+    public void onDestroy() {
+       File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+       File upFile = upFolder.listFiles()[0];
+       upFile.delete();
+       upFolder.delete();
+       super.onDestroy();

     }
     
     }
     

+    

     public void onClickHandler(View button) {
        switch (button.getId()) {
                case R.id.button_refresh:
     public void onClickHandler(View button) {
        switch (button.getId()) {
                case R.id.button_refresh:


@@ -67,12 +110,18 @@ public class MainActivity extends Activity implements OnRemoteOperationListener
     }
     
     private void startRefresh() {
     }
     
     private void startRefresh() {

-       RemoteOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
+       ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);

        refreshOperation.execute(mClient, this, mHandler);
     }
     
     private void startUpload() {
        refreshOperation.execute(mClient, this, mHandler);
     }
     
     private void startUpload() {

-       Toast.makeText(this, R.string.todo_start_upload, Toast.LENGTH_SHORT).show();
+       File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+       File fileToUpload = upFolder.listFiles()[0]; 
+       String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
+       String mimeType = getString(R.string.sample_file_mimetype);
+       UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType);
+       uploadOperation.addDatatransferProgressListener(this);
+       uploadOperation.execute(mClient, this, mHandler);

     }
     
     private void startRemoteDeletion() {
     }
     
     private void startRemoteDeletion() {


@@ -91,10 +140,14 @@ public class MainActivity extends Activity implements OnRemoteOperationListener
        public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
                if (!result.isSuccess()) {
                        Toast.makeText(this, R.string.todo_operation_finished_in_fail, Toast.LENGTH_SHORT).show();
        public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
                if (!result.isSuccess()) {
                        Toast.makeText(this, R.string.todo_operation_finished_in_fail, Toast.LENGTH_SHORT).show();

+                       Log.e(LOG_TAG, result.getLogMessage(), result.getException());

                        
                } else if (operation instanceof ReadRemoteFolderOperation) {
                        onSuccessfulRefresh((ReadRemoteFolderOperation)operation, result);
                        
                        
                } else if (operation instanceof ReadRemoteFolderOperation) {
                        onSuccessfulRefresh((ReadRemoteFolderOperation)operation, result);
                        

+               } else if (operation instanceof UploadRemoteFileOperation ) {
+                       onSuccessfulUpload((UploadRemoteFileOperation)operation, result);
+                       

                } else {
                        Toast.makeText(this, R.string.todo_operation_finished_in_success, Toast.LENGTH_SHORT).show();
                }
                } else {
                        Toast.makeText(this, R.string.todo_operation_finished_in_success, Toast.LENGTH_SHORT).show();
                }


@@ -109,5 +162,37 @@ public class MainActivity extends Activity implements OnRemoteOperationListener
                }
                mFilesAdapter.notifyDataSetChanged();
        }
                }
                mFilesAdapter.notifyDataSetChanged();
        }

+
+       private void onSuccessfulUpload(UploadRemoteFileOperation operation, RemoteOperationResult result) {
+               startRefresh();
+       }
+
+
+       @Override
+       public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {
+               final long percentage = totalTransferredSoFar * 100 / totalToTransfer;
+               final boolean upload = fileName.contains(getString(R.string.upload_folder_path));
+               //Log.d(LOG_TAG, "progressRate " + percentage);
+       mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                               TextView progressView = null;
+                               if (upload) {
+                                       progressView = (TextView) findViewById(R.id.upload_progress);
+                               } else {
+                                       progressView = (TextView) findViewById(R.id.download_progress);
+                               }
+                               if (progressView != null) {
+                               progressView.setText(Long.toString(percentage) + "%");
+                               }
+            }
+        });
+       }
+
+
+       @Override
+       public void onTransferProgress(long arg0) {
+               // TODO Remove from library
+       }

        
 }
        
 }