From: masensio <masensio@solidgear.es>
Date: Thu, 22 Aug 2013 10:59:56 +0000 (+0200)
Subject: Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s... 
X-Git-Tag: oc-android-1.4.6~17^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dea37f653c4ec0e39ea3c8d30809996660b5816f?ds=inline;hp=-c

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
	res/values-es/strings.xml
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
---

dea37f653c4ec0e39ea3c8d30809996660b5816f
diff --combined res/values-es/strings.xml
index b7b4b2e4,065e95b1..8e6ad5e4
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@@ -45,10 -45,11 +45,11 @@@
    <string name="prefs_log_title_history">Historia del Registro</string>
    <string name="prefs_log_summary_history">Esto muestra los registros grabados</string>
    <string name="prefs_log_delete_history_button">Eliminar Historial</string>
+   <string name="auth_check_server">Compruebe el servidor.</string>
    <string name="auth_host_url">Dirección del servidor</string>
    <string name="auth_username">Nombre de usuario</string>
    <string name="auth_password">Contraseña</string>
-   <string name="auth_register">Soy nuevo en %1$s</string>
+   <string name="auth_register">New to %1$s?</string>
    <string name="new_session_uri_error">La URL dada es incorrecta</string>
    <string name="new_session_session_name_error">Nombre de sesión incorrecto</string>
    <string name="sync_string_files">Archivos</string>
@@@ -92,6 -93,7 +93,7 @@@
    <string name="common_loading">Cargando ...</string>
    <string name="common_error_unknown">Error desconocido</string>
    <string name="about_title">Acerca de</string>
+   <string name="change_password">Cambiar contraseña</string>
    <string name="delete_account">Eliminar cuenta</string>
    <string name="create_account">Crear cuenta</string>
    <string name="upload_chooser_title">Subir</string>
@@@ -115,7 -117,7 +117,7 @@@
    <string name="sync_string_contacts">Contactos</string>
    <string name="sync_fail_ticker">Falló la sincronización</string>
    <string name="sync_fail_content">La sincronización de %1$s s no se pudo completar</string>
-   <string name="sync_fail_content_unauthorized">Credenciales inválidas para %1$s</string>
+   <string name="sync_fail_content_unauthorized">Contraseña no válida para %1$s</string>
    <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
    <string name="sync_conflicts_in_favourites_content">Falló la sincronización de contenidos de %1$d ficheros</string>
    <string name="sync_fail_in_favourites_ticker">Fallos en la sincronización de contenidos</string>
@@@ -172,7 -174,7 +174,7 @@@
      <item>30</item>
      <item>60</item>
    </string-array>
-   <string name="auth_trying_to_login">Intentando iniciar sesión...</string>
+   <string name="auth_trying_to_login">Intentado iniciar sesión...</string>
    <string name="auth_no_net_conn_title">Sin conexión de red</string>
    <string name="auth_no_net_conn_message">No se ha detectado una conexión de red, chequea tu conexión a internet e intenta nuevamente.</string>
    <string name="auth_connect_anyway">Conectar de todos modos</string>
@@@ -195,14 -197,14 +197,14 @@@
    <string name="auth_bad_oc_version_title">No se reconoce  la versión del servidor </string>
    <string name="auth_wrong_connection_title">No se ha podido establecer la conexión</string>
    <string name="auth_secure_connection">Conexión segura establecida</string>
-   <string name="auth_unauthorized">Credenciales inválidas</string>
+   <string name="auth_unauthorized">Nombre de usuario o contraseña incorrecta</string>
    <string name="auth_oauth_error">Autorización no satisfactoria</string>
    <string name="auth_oauth_error_access_denied">Acceso denegado por servidor de autorización</string>
    <string name="auth_not_found">Ruta errónea</string>
    <string name="auth_internal">Error interno en el servidor, código %1$d</string>
    <string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introduzca la URL del servidor de nuevo</string>
 -  <string name="auth_expired_oauth_token_toast">Su autorización ha expirado.\nPor favor, autorice de nuevo</string>
 +  <string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Por favor, autorice de nuevo</string>
-   <string name="auth_expired_basic_auth_toast">Sus credenciales guardadas son inválidas. Por favor, introduzca sus credenciales actuales</string>
+   <string name="auth_expired_basic_auth_toast">Por favor, introduzca la contraseña actual.</string>
    <string name="crashlog_message">La aplicación finalizó inesperadamente. ¿Desea enviar un reporte de error?</string>
    <string name="crashlog_send_report">Enviar reporte</string>
    <string name="crashlog_dont_send_report">No enviar reporte</string>
diff --combined src/com/owncloud/android/operations/RemoteOperationResult.java
index 7a70744e,57014768..ef46c96a
--- a/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/operations/RemoteOperationResult.java
@@@ -99,7 -99,7 +99,7 @@@ public class RemoteOperationResult impl
          mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL);
      }
  
 -    public RemoteOperationResult(boolean success, int httpCode) {
 +    private RemoteOperationResult(boolean success, int httpCode) {
          mSuccess = success;
          mHttpCode = httpCode;
  
@@@ -318,7 -318,7 +318,7 @@@
      public String getRedirectedLocation() {
          return mRedirectedLocation;
      }
- 
+     
      public boolean isIdPRedirection() {
          return (mRedirectedLocation.toUpperCase().contains("SAML") || 
                  mRedirectedLocation.toLowerCase().contains("wayf"));
diff --combined src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 0236a139,aaca935c..67c7389e
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -28,6 -28,7 +28,7 @@@ import java.util.List
  import java.util.Map;
  import java.util.Vector;
  
+ import org.apache.commons.httpclient.Header;
  import org.apache.http.HttpStatus;
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
@@@ -242,10 -243,14 +243,10 @@@ public class SynchronizeFolderOperatio
                      result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);   // should be different result, but will do the job
                              
                  } else {
 -                    result = new RemoteOperationResult(true, status);
 -                    Header hCookie = query.getResponseHeader("Cookie");
 -                    if (hCookie != null) {
 -                        Log_OC.d(TAG, "PROPFIND cookie: " + hCookie.getValue());
 -                    }
 +                    result = new RemoteOperationResult(true, status, query.getResponseHeaders());
                  }
              } else {
 -                result = new RemoteOperationResult(false, status);
 +                result = new RemoteOperationResult(false, status, query.getResponseHeaders());
              }