Quick patch to fix operations not ready for HTTPS

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1ba98f5..528c742 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.183B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.184B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/Uploader.java b/src/eu/alefzero/owncloud/Uploader.java
index 354b007..523db94 100644 (file)
--- a/src/eu/alefzero/owncloud/Uploader.java
+++ b/src/eu/alefzero/owncloud/Uploader.java
@@ -369,6 +369,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 \r
     public void uploadFiles() {\r
         WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r
 \r
     public void uploadFiles() {\r
         WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r

+        wdc.allowSelfsignedCertificates();\r

 \r
         // create last directory in path if nessesary\r
         if (mCreateDir) {\r
 \r
         // create last directory in path if nessesary\r
         if (mCreateDir) {\r

diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index b23abf9..01a1f58 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -373,8 +373,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
 
     @Override
     public String toString() {
 
     @Override
     public String toString() {

-        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s]";
-        asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath);
+        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSinc=%s]";
+        asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, new Long(mParentId), new Boolean(mKeepInSync));

         return asString;
     }
 
         return asString;
     }
 

diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java
index 8bdcedf..db2461c 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileUploader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java
@@ -144,6 +144,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         mNotificationManager.notify(42, mNotification);
 
         WebdavClient wc = new WebdavClient(mAccount, getApplicationContext());
         mNotificationManager.notify(42, mNotification);
 
         WebdavClient wc = new WebdavClient(mAccount, getApplicationContext());

+        wc.allowSelfsignedCertificates();

         wc.setDataTransferProgressListener(this);
 
         for (int i = 0; i < mLocalPaths.length; ++i) {
         wc.setDataTransferProgressListener(this);
 
         for (int i = 0; i < mLocalPaths.length; ++i) {

diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index 5ea4e3e..fa982e7 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -154,6 +154,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                 throw new UnknownHostException();\r
             }\r
             mClient = new WebdavClient(account, getContext());\r
                 throw new UnknownHostException();\r
             }\r
             mClient = new WebdavClient(account, getContext());\r

+            mClient.allowSelfsignedCertificates();\r

             // mHost = mClient.getTargetHost();\r
         }\r
 \r
             // mHost = mClient.getTargetHost();\r
         }\r
 \r

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index 3397836..42d3e36 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -150,7 +150,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r

-            //Log.v(TAG, "syncing: fetching " + uri);\r
+            Log.d(TAG, "fetching " + uri);\r

             \r
             // remote request \r
             PropFindMethod query = new PropFindMethod(uri);\r
             \r
             // remote request \r
             PropFindMethod query = new PropFindMethod(uri);\r


@@ -187,6 +187,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r
                 \r
                 //getStorageManager().saveFile(file);\r
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r
                 \r
                 //getStorageManager().saveFile(file);\r

+                Log.v(TAG, "adding file: " + file);\r

                 updatedFiles.add(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r
                 updatedFiles.add(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r


@@ -207,6 +208,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             for (int i=0; i < files.size(); ) {\r
                 file = files.get(i);\r
                 if (file.getLastSyncDate() != mCurrentSyncTime) {\r
             for (int i=0; i < files.size(); ) {\r
                 file = files.get(i);\r
                 if (file.getLastSyncDate() != mCurrentSyncTime) {\r

+                    Log.v(TAG, "removing file: " + file);\r

                     getStorageManager().removeFile(file);\r
                     files.remove(i);\r
                 } else {\r
                     getStorageManager().removeFile(file);\r
                     files.remove(i);\r
                 } else {\r


@@ -224,7 +226,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());\r
                 }\r
             }\r
                     fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());\r
                 }\r
             }\r

-            if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancellation request");\r
+            if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancelation request");\r

                 \r
             /*  Commented code for ugly performance tests\r
             mResponseDelays[mDelaysIndex] = responseDelay;\r
                 \r
             /*  Commented code for ugly performance tests\r
             mResponseDelays[mDelaysIndex] = responseDelay;\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 5d69455..ad6f604 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -733,6 +733,7 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r

+            wc.allowSelfsignedCertificates();\r

             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r


@@ -863,6 +864,7 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r

+            wc.allowSelfsignedCertificates();\r

             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r