mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-10-23 04:26:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

OC-1055: Remove follow instruction.

Browse source
This commit is contained in:
masensio 2013-08-23 13:28:02 +02:00
parent 92c4528bdf
commit 3072a29730
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -716,6 +716,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
mAuthCheckOperation = new ExistenceCheckOperation("", this, false);
WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);
mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);
}
/**
@ -758,8 +759,8 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);
mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);
mAuthStatusIcon = android.R.drawable.ic_secure;
mAuthStatusText = R.string.auth_follow_auth_server;
mAuthStatusIcon = 0;
mAuthStatusText = 0;
} else {
mAuthStatusIcon = R.drawable.common_error;
@ -1102,6 +1103,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
showAuthStatus();
Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
}
}
@ -1540,6 +1542,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
finish();
}
}
}
@ -1563,8 +1566,8 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
// TODO - show fail
Log_OC.d(TAG, "SSO failed");
}
}
}
}

5
src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
View file

@ -29,6 +29,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebBackForwardList;
import android.webkit.WebSettings;
import android.webkit.WebView;
@ -115,7 +116,9 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
public void onCreate(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreate");
super.onCreate(savedInstanceState);
CookieSyncManager.createInstance(getActivity());
if (savedInstanceState == null) {
mInitialUrl = getArguments().getString(ARG_INITIAL_URL);
mTargetUrl = getArguments().getString(ARG_TARGET_URL);