mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix password change

Browse source
This commit is contained in:
Mario Danic 2017-03-17 16:28:18 +01:00 committed by AndyScherzinger
parent 22a2f92909
commit d079808c6d
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/com/owncloud/android/ui/components/CustomEditText.java
View file

@ -1,21 +1,21 @@
/**
* Nextcloud Android client application
* Nextcloud Android client application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or 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 AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
* @author Mario Danic
* Copyright (C) 2017 Mario Danic
* <p>
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
* <p>
* 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 AFFERO GENERAL PUBLIC LICENSE for more details.
* <p>
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.components;
@ -56,7 +56,8 @@ public class CustomEditText extends android.support.v7.widget.AppCompatEditText
}
public String getFullServerUrl() {
if (TextUtils.isEmpty(fixedText)) {
if (TextUtils.isEmpty(fixedText) || getText().toString().startsWith("http://")
|| getText().toString().startsWith("https://")) {
return getText().toString();
} else if (isPrefixFixed) {
return (getResources().getString(R.string.server_url) + "/" + getText().toString());
@ -76,7 +77,8 @@ public class CustomEditText extends android.support.v7.widget.AppCompatEditText
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if (!TextUtils.isEmpty(fixedText)) {
if (!getText().toString().startsWith("http://") && !getText().toString().startsWith("https://")
&& !TextUtils.isEmpty(fixedText)) {
if (isPrefixFixed) {
canvas.drawText(fixedText, super.getCompoundPaddingLeft(), getBaseline(), getPaint());
} else {

16
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -6,16 +6,16 @@
* @author masensio
* Copyright (C) 2012 Bartek Przybylski
* Copyright (C) 2015 ownCloud Inc.
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
* as published by the Free Software Foundation.
*
* <p>
* 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.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -456,9 +456,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
if (isUrlInputAllowed) {
mRefreshButton = findViewById(R.id.embeddedRefreshButton);
if (serverInputType.equals(DIRECTORY_SERVER_INPUT_TYPE) ||
serverInputType.equals(SUBDOMAIN_SERVER_INPUT_TYPE)) {
mHostUrlInput.setText("");
if (mAction == ACTION_CREATE) {
if (serverInputType.equals(DIRECTORY_SERVER_INPUT_TYPE) ||
serverInputType.equals(SUBDOMAIN_SERVER_INPUT_TYPE)) {
mHostUrlInput.setText("");
}
}
} else {
findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
@ -1794,7 +1796,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
inputField.equals(mHostUrlInput) &&
AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).
equals(mAuthTokenType)) {
checkOcServer();
checkOcServer();
}
return false; // always return false to grant that the software keyboard is hidden anyway
}