Fixed local path NULL when making favourite a file not down ; fixed change of local...

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

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 50b8361..9b204f3 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -68,9 +68,14 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r

+import com.owncloud.android.files.services.FileObserverService;\r

 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileUploader;\r

+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r

 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r

+import com.owncloud.android.operations.RemoteOperationResult;\r

 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r

+import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r

 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r


@@ -85,16 +90,20 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r

-    OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener {\r
+    OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener {\r

     \r
     private ArrayAdapter<String> mDirectories;\r
     \r
     private ArrayAdapter<String> mDirectories;\r

-    private OCFile mCurrentDir;\r
+    private OCFile mCurrentDir = null;\r
+    private OCFile mCurrentFile = null;\r

 \r
     private DataStorageManager mStorageManager;\r
     private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
     private UploadFinishReceiver mUploadFinishReceiver;\r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private FileDownloaderBinder mDownloaderBinder = null;\r
 \r
     private DataStorageManager mStorageManager;\r
     private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
     private UploadFinishReceiver mUploadFinishReceiver;\r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private FileDownloaderBinder mDownloaderBinder = null;\r

+    private FileUploaderBinder mUploaderBinder = null;\r
+    private ServiceConnection mDownloadConnection = null, mUploadConnection = null;\r
+    private RemoteOperationResult mLastSslUntrustedServerResult = null;\r

     \r
     private OCFileListFragment mFileList;\r
     \r
     \r
     private OCFileListFragment mFileList;\r
     \r


@@ -105,6 +114,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private static final int DIALOG_ABOUT_APP = 2;\r
     public static final int DIALOG_SHORT_WAIT = 3;\r
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;\r
     private static final int DIALOG_ABOUT_APP = 2;\r
     public static final int DIALOG_SHORT_WAIT = 3;\r
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;\r

+    private static final int DIALOG_SSL_VALIDATOR = 5;\r
+    private static final int DIALOG_CERT_NOT_SAVED = 6;\r
+\r

     \r
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;\r
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;\r
     \r
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;\r
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;\r


@@ -116,8 +128,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
 \r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
 \r

-        /// saved instance state: keep this always before initDataFromCurrentAccount()\r
+        /// Load of parameters from received intent\r
+        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent\r
+        Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
+        if (account != null)\r
+            AccountUtils.setCurrentOwnCloudAccount(this, account.name);\r
+        \r
+        /// Load of saved instance state: keep this always before initDataFromCurrentAccount()\r

         if(savedInstanceState != null) {\r
         if(savedInstanceState != null) {\r

+            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES\r

             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
         }\r
         \r
             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
         }\r
         \r


@@ -128,10 +147,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
         } else {    /// at least an account is available\r
             \r
             \r
         } else {    /// at least an account is available\r
             \r

-            bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);\r
-            initDataFromCurrentAccount();\r
+            initDataFromCurrentAccount();   // it checks mCurrentDir and mCurrentFile with the current account\r

             \r
         }\r
             \r
         }\r

+        \r
+        mUploadConnection = new ListServiceConnection(); \r
+        mDownloadConnection = new ListServiceConnection();\r
+        bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);\r
+        bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);\r

 \r
         // PIN CODE request ;  best location is to decide, let's try this first\r
         if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
 \r
         // PIN CODE request ;  best location is to decide, let's try this first\r
         if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r


@@ -139,10 +162,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }\r
 \r
         // file observer\r
         }\r
 \r
         // file observer\r

-        /*Intent observer_intent = new Intent(this, FileObserverService.class);\r
+        Intent observer_intent = new Intent(this, FileObserverService.class);\r

         observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
         startService(observer_intent);\r
         observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
         startService(observer_intent);\r

-        */\r
+        \r

             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r


@@ -160,10 +183,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         setContentView(R.layout.files);    \r
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         mDualPane = (findViewById(R.id.file_details_container) != null);\r
         setContentView(R.layout.files);    \r
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         mDualPane = (findViewById(R.id.file_details_container) != null);\r

-        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
-            transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
-            transaction.commit();\r
+        if (mDualPane) {\r
+            initFileDetailsInDualPane();\r

         }\r
             \r
         // Action bar setup\r
         }\r
             \r
         // Action bar setup\r


@@ -174,11 +195,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
         actionBar.setListNavigationCallbacks(mDirectories, this);\r
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation\r
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
         actionBar.setListNavigationCallbacks(mDirectories, this);\r
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation\r

-            \r
+        \r

         Log.d(getClass().toString(), "onCreate() end");\r
     }\r
 \r
         Log.d(getClass().toString(), "onCreate() end");\r
     }\r
 \r

-\r
+    \r

     /**\r
      * Launches the account creation activity. To use when no ownCloud account is available\r
      */\r
     /**\r
      * Launches the account creation activity. To use when no ownCloud account is available\r
      */\r


@@ -198,24 +219,50 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 AccountUtils.getCurrentOwnCloudAccount(this),\r
                 getContentResolver());\r
 \r
                 AccountUtils.getCurrentOwnCloudAccount(this),\r
                 getContentResolver());\r
 \r

-        /// State recovery - CURRENT DIRECTORY ; priority: 1/ getIntent(), 2/ savedInstanceState (in onCreate()), 3/ root dir\r
-        if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)) {\r
-            mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
-            if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r
-                mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
-            }\r
-            // clear intent extra, so rotating the screen will not return us to this directory\r
-            getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
+        /// Check if mCurrentDir is a directory\r
+        if(mCurrentDir != null && !mCurrentDir.isDirectory()) {\r
+            mCurrentFile = mCurrentDir;\r
+            mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
+        }\r
+        \r
+        /// Check if mCurrentDir and mCurrentFile are in the current account, and update them\r
+        if (mCurrentDir != null) {\r
+            mCurrentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());   // mCurrentDir == null if it is not in the current account\r
+        }\r
+        if (mCurrentFile != null) {\r
+            if (mCurrentFile.fileExists()) {\r
+                mCurrentFile = mStorageManager.getFileByPath(mCurrentFile.getRemotePath());   // mCurrentFile == null if it is not in the current account\r
+            }   // else : keep mCurrentFile with the received value; this is currently the case of an upload in progress, when the user presses the status notification in a landscape tablet\r
+        }\r
+        \r
+        /// Default to root if mCurrentDir was not found\r
+        if (mCurrentDir == null) {\r
+            mCurrentDir = mStorageManager.getFileByPath("/"); // will be NULL if the database was never synchronized\r

         }\r
         }\r

-        if (mCurrentDir == null)\r
-            mCurrentDir = mStorageManager.getFileByPath("/");   // this will return NULL if the database has not ever synchronized\r

     }\r
         \r
     \r
     }\r
         \r
     \r

+    private void initFileDetailsInDualPane() {\r
+        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            if (mCurrentFile != null) {\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); // empty FileDetailFragment\r
+                mCurrentFile = null;\r
+            } else {\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
+            }\r
+            transaction.commit();\r
+        }\r
+    }\r
+    \r
+    \r

     @Override\r
     public void onDestroy() {\r
         super.onDestroy();\r
     @Override\r
     public void onDestroy() {\r
         super.onDestroy();\r

-        unbindService(mConnection);\r
+        if (mDownloadConnection != null)\r
+            unbindService(mDownloadConnection);\r
+        if (mUploadConnection != null)\r
+            unbindService(mUploadConnection);\r

     }\r
 \r
     \r
     }\r
 \r
     \r


@@ -235,12 +282,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;\r
             }\r
             case R.id.startSync: {\r
                 break;\r
             }\r
             case R.id.startSync: {\r

-                ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
-                Bundle bundle = new Bundle();\r
-                bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
-                ContentResolver.requestSync(\r
-                        AccountUtils.getCurrentOwnCloudAccount(this),\r
-                        AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
+                startSynchronization();\r

                 break;\r
             }\r
             case R.id.action_upload: {\r
                 break;\r
             }\r
             case R.id.action_upload: {\r


@@ -268,6 +310,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         return retval;\r
     }\r
 \r
         return retval;\r
     }\r
 \r

+    private void startSynchronization() {\r
+        ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
+        Bundle bundle = new Bundle();\r
+        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
+        ContentResolver.requestSync(\r
+                AccountUtils.getCurrentOwnCloudAccount(this),\r
+                AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
+    }\r
+\r
+\r

     @Override\r
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
         int i = itemPosition;\r
     @Override\r
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
         int i = itemPosition;\r


@@ -386,7 +438,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r
             if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r

-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r

                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r


@@ -403,6 +455,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onSaveInstanceState() start");\r
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
         Log.d(getClass().toString(), "onSaveInstanceState() start");\r
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r

+        if (mDualPane) {\r
+            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fragment != null) {\r
+                OCFile file = fragment.getDisplayedFile();\r
+                if (file != null) {\r
+                    outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);\r
+                }\r
+            }\r
+        }\r

         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r
         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r


@@ -416,6 +477,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (mStorageManager == null) {\r
                 // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created \r
                 initDataFromCurrentAccount();\r
             if (mStorageManager == null) {\r
                 // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created \r
                 initDataFromCurrentAccount();\r

+                if (mDualPane) {\r
+                    initFileDetailsInDualPane();\r
+                }\r

             }\r
             \r
             // Listen for sync messages\r
             }\r
             \r
             // Listen for sync messages\r


@@ -434,7 +498,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
         \r
             // List current directory\r
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
         \r
             // List current directory\r

-            mFileList.listDirectory(mCurrentDir);   // we should find the way to avoid the need of this\r
+            mFileList.listDirectory(mCurrentDir);   // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)\r

             \r
         } else {\r
             \r
             \r
         } else {\r
             \r


@@ -445,6 +509,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onResume() end");\r
     }\r
 \r
         Log.d(getClass().toString(), "onResume() end");\r
     }\r
 \r

+    \r

     @Override\r
     protected void onPause() {\r
         Log.d(getClass().toString(), "onPause() start");\r
     @Override\r
     protected void onPause() {\r
         Log.d(getClass().toString(), "onPause() start");\r


@@ -465,10 +530,18 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             dismissDialog(DIALOG_SETUP_ACCOUNT);\r
         }\r
         \r
             dismissDialog(DIALOG_SETUP_ACCOUNT);\r
         }\r
         \r

-        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r

         Log.d(getClass().toString(), "onPause() end");\r
     }\r
 \r
         Log.d(getClass().toString(), "onPause() end");\r
     }\r
 \r

+    \r
+    @Override\r
+    protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {\r
+        if (id == DIALOG_SSL_VALIDATOR && mLastSslUntrustedServerResult != null) {\r
+            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
+        }\r
+    }\r
+\r
+    \r

     @Override\r
     protected Dialog onCreateDialog(int id) {\r
         Dialog dialog = null;\r
     @Override\r
     protected Dialog onCreateDialog(int id) {\r
         Dialog dialog = null;\r


@@ -501,7 +574,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r

-                builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName );\r
+                builder.setMessage(String.format(getString(R.string.about_message), pkg.versionName));\r

                 builder.setIcon(android.R.drawable.ic_menu_info_details);\r
                 dialog = builder.create();\r
             } catch (NameNotFoundException e) {\r
                 builder.setIcon(android.R.drawable.ic_menu_info_details);\r
                 dialog = builder.create();\r
             } catch (NameNotFoundException e) {\r


@@ -594,6 +667,23 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             dialog = builder.create();\r
             break;\r
         }\r
             dialog = builder.create();\r
             break;\r
         }\r

+        case DIALOG_SSL_VALIDATOR: {\r
+            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
+            break;\r
+        }\r
+        case DIALOG_CERT_NOT_SAVED: {\r
+            builder = new AlertDialog.Builder(this);\r
+            builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
+            builder.setCancelable(false);\r
+            builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {\r
+                    @Override\r
+                    public void onClick(DialogInterface dialog, int which) {\r
+                        dialog.dismiss();\r
+                    };\r
+                });\r
+            dialog = builder.create();\r
+            break;\r
+        }\r

         default:\r
             dialog = null;\r
         }\r
         default:\r
             dialog = null;\r
         }\r


@@ -670,7 +760,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         mStorageManager.saveFile(newDir);\r
     \r
                         // Display the new folder right away\r
                         mStorageManager.saveFile(newDir);\r
     \r
                         // Display the new folder right away\r

-                        mFileList.listDirectory(mCurrentDir);\r
+                        mFileList.listDirectory();\r

                     }\r
                 });\r
                 \r
                     }\r
                 });\r
                 \r


@@ -721,6 +811,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
     private class SyncBroadcastReceiver extends BroadcastReceiver {\r
     }\r
 \r
     private class SyncBroadcastReceiver extends BroadcastReceiver {\r

+\r

         /**\r
          * {@link BroadcastReceiver} to enable syncing feedback in UI\r
          */\r
         /**\r
          * {@link BroadcastReceiver} to enable syncing feedback in UI\r
          */\r


@@ -751,13 +842,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r
                     if (fileListFragment != null) {\r
                     OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r
                     if (fileListFragment != null) {\r

-                        fileListFragment.listDirectory(mCurrentDir);  \r
+                        fileListFragment.listDirectory(mCurrentDir);\r

                     }\r
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r
                 \r
             }\r
                     }\r
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r
                 \r
             }\r

+            \r
+            RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);\r
+            if (synchResult != null) {\r
+                if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {\r
+                    mLastSslUntrustedServerResult = synchResult;\r
+                    showDialog(DIALOG_SSL_VALIDATOR); \r
+                }\r
+            }\r

         }\r
     }\r
     \r
         }\r
     }\r
     \r


@@ -836,7 +935,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r
             if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r

-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r

                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r


@@ -860,7 +959,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         } else {    // small or medium screen device -> new Activity\r
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
         } else {    // small or medium screen device -> new Activity\r
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r

-            showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r

             startActivity(showDetailsIntent);\r
         }\r
     }\r
             startActivity(showDetailsIntent);\r
         }\r
     }\r


@@ -894,27 +993,50 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public FileDownloaderBinder getFileDownloaderBinder() {\r
         return mDownloaderBinder;\r
     }\r
     public FileDownloaderBinder getFileDownloaderBinder() {\r
         return mDownloaderBinder;\r
     }\r

+\r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public FileUploaderBinder getFileUploaderBinder() {\r
+        return mUploaderBinder;\r
+    }\r

     \r
     \r
     /** Defines callbacks for service binding, passed to bindService() */\r
     \r
     \r
     /** Defines callbacks for service binding, passed to bindService() */\r

-    private ServiceConnection mConnection = new ServiceConnection() {\r
+    private class ListServiceConnection implements ServiceConnection {\r

 \r
         @Override\r
 \r
         @Override\r

-        public void onServiceConnected(ComponentName className, IBinder service) {\r
-            mDownloaderBinder = (FileDownloaderBinder) service;\r
-            // a new chance to get the mDownloadBinder through getDownloadBinder() - THIS IS A MESS\r
-            mFileList.listDirectory();\r
+        public void onServiceConnected(ComponentName component, IBinder service) {\r
+            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
+                Log.d(TAG, "Download service connected");\r
+                mDownloaderBinder = (FileDownloaderBinder) service;\r
+            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
+                Log.d(TAG, "Upload service connected");\r
+                mUploaderBinder = (FileUploaderBinder) service;\r
+            } else {\r
+                return;\r
+            }\r
+            // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS\r
+            if (mFileList != null)\r
+                mFileList.listDirectory();\r

             if (mDualPane) {\r
                 FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
                 if (fragment != null)\r
                     fragment.updateFileDetails();\r
             }\r
             if (mDualPane) {\r
                 FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
                 if (fragment != null)\r
                     fragment.updateFileDetails();\r
             }\r

-            \r

         }\r
 \r
         @Override\r
         }\r
 \r
         @Override\r

-        public void onServiceDisconnected(ComponentName arg0) {\r
-            mDownloaderBinder = null;\r
+        public void onServiceDisconnected(ComponentName component) {\r
+            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
+                Log.d(TAG, "Download service disconnected");\r
+                mDownloaderBinder = null;\r
+            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
+                Log.d(TAG, "Upload service disconnected");\r
+                mUploaderBinder = null;\r
+            }\r

         }\r
     };    \r
 \r
         }\r
     };    \r
 \r


@@ -935,4 +1057,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
 \r
     }\r
 \r
 \r

+    @Override\r
+    public void onSavedCertificate() {\r
+        startSynchronization();                \r
+    }\r
+\r
+\r
+    @Override\r
+    public void onFailedSavingCertificate() {\r
+        showDialog(DIALOG_CERT_NOT_SAVED);\r
+    }\r
+\r
+\r

 }\r
 }\r