Merge tag 'oc-android-1-3-22' into oauth_login

Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java

diff --cc AndroidManifest.xml
index 3cb2578,341cbc5..f031ad4
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -120,16 -122,11 +122,18 @@@
          <activity\r
              android:name=".ui.activity.AuthenticatorActivity"\r
              android:exported="true"\r
 -            android:theme="@style/Theme.ownCloud.noActionBar" >\r
 +            android:theme="@style/Theme.ownCloud.noActionBar" \r
 +            android:launchMode="singleTask">\r
 +            <intent-filter>\r
 +                <action android:name="android.intent.action.VIEW" />\r
- \r
 +                <category android:name="android.intent.category.DEFAULT" />\r
 +                <category android:name="android.intent.category.BROWSABLE" />\r
- \r
 +                <data android:scheme="oauth-mobile-app" />\r
 +            </intent-filter>\r
+             <intent-filter>\r
+                 <action android:name="com.owncloud.android.workaround.accounts.CREATE" />\r
+                 <category android:name="android.intent.category.DEFAULT" />\r
+             </intent-filter>\r
          </activity>\r
  \r
          <service android:name=".files.services.FileDownloader" >\r

diff --cc res/layout-land/account_setup.xml
Simple merge

diff --cc res/layout/account_setup.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc res/values/styles.xml
Simple merge

diff --cc src/com/owncloud/android/AccountUtils.java
Simple merge

diff --cc src/com/owncloud/android/Uploader.java
Simple merge

diff --cc src/com/owncloud/android/authenticator/AccountAuthenticator.java
Simple merge

diff --cc src/com/owncloud/android/files/OwnCloudFileObserver.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileDownloader.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge

diff --cc src/com/owncloud/android/network/OwnCloudClientUtils.java
Simple merge

diff --cc src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
index e803616,0000000..7132c53
mode 100644,000000..100644
--- 1/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
--- /dev/null
+++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
@@@ -1,138 -1,0 +1,138 @@@
-  *   Copyright (C) 2012 Bartek Przybylski
 +/* ownCloud Android client application
-  *   the Free Software Foundation, either version 3 of the License, or
++ *   Copyright (C) 2012-2013 ownCloud Inc.
 + *
 + *   This program is free software: you can redistribute it and/or modify
 + *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation, either version 2 of the License, or
 + *   (at your option) any later version.
 + *
 + *   This program is distributed in the hope that it will be useful,
 + *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *   GNU General Public License for more details.
 + *
 + *   You should have received a copy of the GNU General Public License
 + *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + *
 + */
 +
 +package com.owncloud.android.operations;
 +
 +import org.apache.commons.httpclient.HttpStatus;
 +import org.apache.commons.httpclient.methods.GetMethod;
 +import org.json.JSONException;
 +import org.json.JSONObject;
 +
 +import com.owncloud.android.AccountUtils;
 +import com.owncloud.android.utils.OwnCloudVersion;
 +
 +import eu.alefzero.webdav.WebdavClient;
 +import android.content.Context;
 +import android.net.ConnectivityManager;
 +import android.net.Uri;
 +import android.util.Log;
 +
 +public class OwnCloudServerCheckOperation extends RemoteOperation {
 +    
 +    /** Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs.  */
 +    public static final int TRY_CONNECTION_TIMEOUT = 5000;
 +    
 +    private static final String TAG = OwnCloudServerCheckOperation.class.getSimpleName();
 +    
 +    private String mUrl;
 +    private RemoteOperationResult mLatestResult;
 +    private Context mContext;
 +    private OwnCloudVersion mOCVersion;
 +
 +    public OwnCloudServerCheckOperation(String url, Context context) {
 +        mUrl = url;
 +        mContext = context;
 +        mOCVersion = null;
 +    }
 +    
 +    public OwnCloudVersion getDiscoveredVersion() {
 +        return mOCVersion;
 +    }
 +
 +    private boolean tryConnection(WebdavClient wc, String urlSt) {
 +        boolean retval = false;
 +        GetMethod get = null;
 +        try {
 +            get = new GetMethod(urlSt);
 +            int status = wc.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
 +            String response = get.getResponseBodyAsString();
 +            if (status == HttpStatus.SC_OK) {
 +                JSONObject json = new JSONObject(response);
 +                if (!json.getBoolean("installed")) {
 +                    mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
 +                } else {
 +                    mOCVersion = new OwnCloudVersion(json.getString("version"));
 +                    if (!mOCVersion.isVersionValid()) {
 +                        mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION);
 +                        
 +                    } else {
 +                        mLatestResult = new RemoteOperationResult(urlSt.startsWith("https://") ? 
 +                                                                    RemoteOperationResult.ResultCode.OK_SSL : 
 +                                                                    RemoteOperationResult.ResultCode.OK_NO_SSL
 +                            );
 +
 +                        retval = true;
 +                    }
 +                }
 +                
 +            } else {
 +                mLatestResult = new RemoteOperationResult(false, status);
 +            }
 +
 +        } catch (JSONException e) {
 +            mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
 +            
 +        } catch (Exception e) {
 +            mLatestResult = new RemoteOperationResult(e);
 +            
 +        } finally {
 +            if (get != null)
 +                get.releaseConnection();
 +        }
 +        
 +        if (mLatestResult.isSuccess()) {
 +            Log.i(TAG, "Connection check at " + urlSt + ": " + mLatestResult.getLogMessage());
 +            
 +        } else if (mLatestResult.getException() != null) {
 +            Log.e(TAG, "Connection check at " + urlSt + ": " + mLatestResult.getLogMessage(), mLatestResult.getException());
 +            
 +        } else {
 +            Log.e(TAG, "Connection check at " + urlSt + ": " + mLatestResult.getLogMessage());
 +        }
 +
 +        return retval;
 +    }
 +
 +    private boolean isOnline() {
 +        ConnectivityManager cm = (ConnectivityManager) mContext
 +                .getSystemService(Context.CONNECTIVITY_SERVICE);
 +        return cm != null && cm.getActiveNetworkInfo() != null
 +                && cm.getActiveNetworkInfo().isConnectedOrConnecting();
 +    }
 +
 +      @Override
 +      protected RemoteOperationResult run(WebdavClient client) {
 +        if (!isOnline()) {
 +              return new RemoteOperationResult(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
 +        }
 +        if (mUrl.startsWith("http://") || mUrl.startsWith("https://")) {
 +            tryConnection(client, mUrl + AccountUtils.STATUS_PATH);
 +            
 +        } else {
 +            client.setBaseUri(Uri.parse("https://" + mUrl + AccountUtils.STATUS_PATH));
 +            boolean httpsSuccess = tryConnection(client, "https://" + mUrl + AccountUtils.STATUS_PATH); 
 +            if (!httpsSuccess && !mLatestResult.isSslRecoverableException()) {
 +                Log.d(TAG, "establishing secure connection failed, trying non secure connection");
 +                client.setBaseUri(Uri.parse("http://" + mUrl + AccountUtils.STATUS_PATH));
 +                tryConnection(client, "http://" + mUrl + AccountUtils.STATUS_PATH);
 +            }
 +        }
 +        return mLatestResult;
 +      }
 +      
 +}

diff --cc src/com/owncloud/android/operations/RemoteOperation.java
Simple merge

diff --cc src/com/owncloud/android/operations/RemoteOperationResult.java
Simple merge

diff --cc src/com/owncloud/android/operations/RenameFileOperation.java
Simple merge

diff --cc src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
Simple merge

diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/AccountSelectActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1d75e69,c8dbca9..eb218d0
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -137,14 -141,12 +141,14 @@@ public class FileDisplayActivity extend
      public void onCreate(Bundle savedInstanceState) {\r
          Log.d(getClass().toString(), "onCreate() start");\r
          super.onCreate(savedInstanceState);\r
 +        \r
 +        mHandler = new Handler();\r
  \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
+         if (account != null && AccountUtils.setCurrentOwnCloudAccount(this, account.name)) {\r
+             mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); \r
+         }\r
          \r
          /// Load of saved instance state: keep this always before initDataFromCurrentAccount()\r
          if(savedInstanceState != null) {\r

diff --cc src/com/owncloud/android/ui/activity/LandingActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge

diff --cc src/eu/alefzero/webdav/WebdavClient.java
Simple merge