/* ownCloud Android client application\r
* Copyright (C) 2012 Bartek Przybylski\r
+ * Copyright (C) 2012-2013 ownCloud Inc.\r
*\r
* This program is free software: you can redistribute it and/or modify\r
* it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
+ * the Free Software Foundation, either version 2 of the License, or\r
* (at your option) any later version.\r
*\r
* This program is distributed in the hope that it will be useful,\r
\r
import java.net.MalformedURLException;\r
import java.net.URL;\r
-import java.net.URLEncoder;\r
\r
import com.owncloud.android.AccountUtils;\r
import com.owncloud.android.authenticator.AccountAuthenticator;\r
import com.owncloud.android.authenticator.AuthenticationRunnable;\r
-import com.owncloud.android.authenticator.ConnectionCheckerRunnable;\r
import com.owncloud.android.authenticator.OnAuthenticationResultListener;\r
import com.owncloud.android.authenticator.OnConnectCheckListener;\r
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
-import com.owncloud.android.extensions.ExtensionsAvailableActivity;\r
-import com.owncloud.android.utils.OwnCloudVersion;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.operations.ConnectionCheckOperation;\r
+import com.owncloud.android.operations.OnRemoteOperationListener;\r
+import com.owncloud.android.operations.RemoteOperation;\r
+import com.owncloud.android.operations.RemoteOperationResult;\r
\r
import android.accounts.Account;\r
import android.accounts.AccountAuthenticatorActivity;\r
import android.accounts.AccountManager;\r
+import android.app.AlertDialog;\r
import android.app.Dialog;\r
import android.app.ProgressDialog;\r
import android.content.ContentResolver;\r
import android.view.View.OnClickListener;\r
import android.view.View.OnFocusChangeListener;\r
import android.view.Window;\r
+import android.widget.Button;\r
+import android.widget.EditText;\r
import android.widget.ImageView;\r
import android.widget.TextView;\r
import com.owncloud.android.R;\r
\r
+import eu.alefzero.webdav.WebdavClient;\r
+\r
/**\r
* This Activity is used to add an ownCloud account to the App\r
* \r
* \r
*/\r
public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
- implements OnAuthenticationResultListener, OnConnectCheckListener,\r
+ implements OnAuthenticationResultListener, OnConnectCheckListener, OnRemoteOperationListener, OnSslValidatorListener, \r
OnFocusChangeListener, OnClickListener {\r
+\r
private static final int DIALOG_LOGIN_PROGRESS = 0;\r
+ private static final int DIALOG_SSL_VALIDATOR = 1;\r
+ private static final int DIALOG_CERT_NOT_SAVED = 2;\r
\r
private static final String TAG = "AuthActivity";\r
\r
private Thread mAuthThread;\r
private AuthenticationRunnable mAuthRunnable;\r
- private ConnectionCheckerRunnable mConnChkRunnable;\r
+ //private ConnectionCheckerRunnable mConnChkRunnable = null;\r
+ private ConnectionCheckOperation mConnChkRunnable;\r
private final Handler mHandler = new Handler();\r
private String mBaseUrl;\r
-\r
+ \r
private static final String STATUS_TEXT = "STATUS_TEXT";\r
private static final String STATUS_ICON = "STATUS_ICON";\r
private static final String STATUS_CORRECT = "STATUS_CORRECT";\r
private static final String IS_SSL_CONN = "IS_SSL_CONN";\r
private int mStatusText, mStatusIcon;\r
private boolean mStatusCorrect, mIsSslConn;\r
+ private RemoteOperationResult mLastSslUntrustedServerResult;\r
\r
public static final String PARAM_USERNAME = "param_Username";\r
public static final String PARAM_HOSTNAME = "param_Hostname";\r
iv2.setOnClickListener(this);\r
tv.setOnFocusChangeListener(this);\r
tv2.setOnFocusChangeListener(this);\r
+\r
+ Button b = (Button) findViewById(R.id.account_register);\r
+ if (b != null) {\r
+ b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
+ }\r
}\r
\r
@Override\r
dialog = working_dialog;\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
+ AlertDialog.Builder 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
Log.e(TAG, "Incorrect dialog called with id = " + id);\r
}\r
return dialog;\r
}\r
\r
+ @Override\r
+ protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {\r
+ switch (id) {\r
+ case DIALOG_LOGIN_PROGRESS:\r
+ case DIALOG_CERT_NOT_SAVED:\r
+ break;\r
+ case DIALOG_SSL_VALIDATOR: {\r
+ ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
+ break;\r
+ }\r
+ default:\r
+ Log.e(TAG, "Incorrect dialog called with id = " + id);\r
+ }\r
+ }\r
+\r
public void onAuthenticationResult(boolean success, String message) {\r
if (success) {\r
TextView username_text = (TextView) findViewById(R.id.account_username), password_text = (TextView) findViewById(R.id.account_password);\r
AccountAuthenticator.ACCOUNT_TYPE);\r
intent.putExtra(AccountManager.KEY_USERDATA, username);\r
\r
- accManager.setUserData(account, AccountAuthenticator.KEY_OC_URL,\r
- url.toString());\r
accManager.setUserData(account,\r
AccountAuthenticator.KEY_OC_VERSION, mConnChkRunnable\r
.getDiscoveredVersion().toString());\r
+ \r
accManager.setUserData(account,\r
AccountAuthenticator.KEY_OC_BASE_URL, mBaseUrl);\r
\r
\r
finish();\r
} else {\r
- dismissDialog(DIALOG_LOGIN_PROGRESS);\r
+ try {\r
+ dismissDialog(DIALOG_LOGIN_PROGRESS);\r
+ } catch (IllegalArgumentException e) {\r
+ // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
+ }\r
TextView tv = (TextView) findViewById(R.id.account_username);\r
- tv.setError(message);\r
+ tv.setError(message + " "); // the extra spaces are a workaround for an ugly bug: \r
+ // 1. insert wrong credentials and connect\r
+ // 2. put the focus on the user name field with using hardware controls (don't touch the screen); the error is shown UNDER the field\r
+ // 3. touch the user name field; the software keyboard appears; the error popup is moved OVER the field and SHRINKED in width, losing the last word\r
+ // Seen, at least, in Android 2.x devices\r
}\r
}\r
public void onCancelClick(View view) {\r
}\r
\r
public void onRegisterClick(View view) {\r
- Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse("https://owncloud.com/mobile/new"));\r
+ Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));\r
setResult(RESULT_CANCELED);\r
startActivity(register);\r
}\r
URL uri = null;\r
String webdav_path = AccountUtils.getWebdavPath(mConnChkRunnable\r
.getDiscoveredVersion());\r
-\r
+ \r
+ if (webdav_path == null) {\r
+ onAuthenticationResult(false, getString(R.string.auth_bad_oc_version_title));\r
+ return;\r
+ }\r
+ \r
try {\r
mBaseUrl = prefix + url;\r
String url_str = prefix + url + webdav_path;\r
uri = new URL(url_str);\r
} catch (MalformedURLException e) {\r
- // should not happen\r
- e.printStackTrace();\r
+ // should never happen\r
+ onAuthenticationResult(false, getString(R.string.auth_incorrect_address_title));\r
+ return;\r
}\r
\r
showDialog(DIALOG_LOGIN_PROGRESS);\r
- mAuthRunnable = new AuthenticationRunnable(uri, username, password);\r
+ mAuthRunnable = new AuthenticationRunnable(uri, username, password, this);\r
mAuthRunnable.setOnAuthenticationResultListener(this, mHandler);\r
mAuthThread = new Thread(mAuthRunnable);\r
mAuthThread.start();\r
if (uri.length() != 0) {\r
setResultIconAndText(R.drawable.progress_small,\r
R.string.auth_testing_connection);\r
- findViewById(R.id.buttonOK).setEnabled(false); // avoid connect can be clicked if the test was previously passed\r
- mConnChkRunnable = new ConnectionCheckerRunnable(uri, this);\r
- mConnChkRunnable.setListener(this, mHandler);\r
- mAuthThread = new Thread(mConnChkRunnable);\r
- mAuthThread.start();\r
+ //mConnChkRunnable = new ConnectionCheckerRunnable(uri, this);\r
+ mConnChkRunnable = new ConnectionCheckOperation(uri, this);\r
+ //mConnChkRunnable.setListener(this, mHandler);\r
+ //mAuthThread = new Thread(mConnChkRunnable);\r
+ //mAuthThread.start();\r
+ WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);\r
+ mAuthThread = mConnChkRunnable.execute(client, this, mHandler);\r
} else {\r
findViewById(R.id.refreshButton).setVisibility(\r
View.INVISIBLE);\r
setResultIconAndText(0, 0);\r
}\r
+ } else {\r
+ // avoids that the 'connect' button can be clicked if the test was previously passed\r
+ findViewById(R.id.buttonOK).setEnabled(false); \r
}\r
} else if (view.getId() == R.id.account_password) {\r
ImageView iv = (ImageView) findViewById(R.id.viewPassword);\r
if (v.getId() == R.id.refreshButton) {\r
onFocusChange(findViewById(R.id.host_URL), false);\r
} else if (v.getId() == R.id.viewPassword) {\r
- TextView view = (TextView) findViewById(R.id.account_password);\r
- int input_type = InputType.TYPE_CLASS_TEXT\r
- | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
+ EditText view = (EditText) findViewById(R.id.account_password);\r
+ int selectionStart = view.getSelectionStart();\r
+ int selectionEnd = view.getSelectionEnd();\r
+ int input_type = view.getInputType();\r
+ if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {\r
+ input_type = InputType.TYPE_CLASS_TEXT\r
+ | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
+ } else {\r
+ input_type = InputType.TYPE_CLASS_TEXT\r
+ | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
+ }\r
view.setInputType(input_type);\r
+ view.setSelection(selectionStart, selectionEnd);\r
}\r
}\r
+\r
+ @Override\r
+ public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
+ if (operation.equals(mConnChkRunnable)) {\r
+ \r
+ mStatusText = mStatusIcon = 0;\r
+ mStatusCorrect = false;\r
+ String t_url = ((TextView) findViewById(R.id.host_URL)).getText()\r
+ .toString().trim().toLowerCase();\r
+ \r
+ switch (result.getCode()) {\r
+ case OK_SSL:\r
+ mIsSslConn = true;\r
+ mStatusIcon = android.R.drawable.ic_secure;\r
+ mStatusText = R.string.auth_secure_connection;\r
+ mStatusCorrect = true;\r
+ break;\r
+ \r
+ case OK_NO_SSL:\r
+ case OK:\r
+ mIsSslConn = false;\r
+ mStatusCorrect = true;\r
+ if (t_url.startsWith("http://") ) {\r
+ mStatusText = R.string.auth_connection_established;\r
+ mStatusIcon = R.drawable.ic_ok;\r
+ } else {\r
+ mStatusText = R.string.auth_nossl_plain_ok_title;\r
+ mStatusIcon = android.R.drawable.ic_partial_secure;\r
+ }\r
+ break;\r
+ \r
+ \r
+ case BAD_OC_VERSION:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_bad_oc_version_title;\r
+ break;\r
+ case WRONG_CONNECTION:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_wrong_connection_title;\r
+ break;\r
+ case TIMEOUT:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_timeout_title;\r
+ break;\r
+ case INCORRECT_ADDRESS:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_incorrect_address_title;\r
+ break;\r
+ \r
+ case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_ssl_unverified_server_title;\r
+ mLastSslUntrustedServerResult = result;\r
+ showDialog(DIALOG_SSL_VALIDATOR); \r
+ break;\r
+ \r
+ case SSL_ERROR:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_ssl_general_error_title;\r
+ break;\r
+ \r
+ case HOST_NOT_AVAILABLE:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_unknown_host_title;\r
+ break;\r
+ case NO_NETWORK_CONNECTION:\r
+ mStatusIcon = R.drawable.no_network;\r
+ mStatusText = R.string.auth_no_net_conn_title;\r
+ break;\r
+ case INSTANCE_NOT_CONFIGURED:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_not_configured_title;\r
+ break;\r
+ case FILE_NOT_FOUND:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_incorrect_path_title;\r
+ break;\r
+ case UNHANDLED_HTTP_CODE:\r
+ case UNKNOWN_ERROR:\r
+ mStatusIcon = R.drawable.common_error;\r
+ mStatusText = R.string.auth_unknown_error_title;\r
+ break;\r
+ default:\r
+ Log.e(TAG, "Incorrect connection checker result type: " + result.getHttpCode());\r
+ }\r
+ setResultIconAndText(mStatusIcon, mStatusText);\r
+ if (!mStatusCorrect)\r
+ findViewById(R.id.refreshButton).setVisibility(View.VISIBLE);\r
+ else\r
+ findViewById(R.id.refreshButton).setVisibility(View.INVISIBLE);\r
+ findViewById(R.id.buttonOK).setEnabled(mStatusCorrect);\r
+ }\r
+ }\r
+\r
+ \r
+ public void onSavedCertificate() {\r
+ mAuthThread = mConnChkRunnable.retry(this, mHandler); \r
+ }\r
+\r
+ @Override\r
+ public void onFailedSavingCertificate() {\r
+ showDialog(DIALOG_CERT_NOT_SAVED);\r
+ }\r
+ \r
}\r
projects / pub / Android / ownCloud.git / blobdiff