projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable change log; to remove in future
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
authenticator
/
AuthenticationRunnable.java
diff --git
a/src/com/owncloud/android/authenticator/AuthenticationRunnable.java
b/src/com/owncloud/android/authenticator/AuthenticationRunnable.java
index
ac547f8
..
948cf33
100644
(file)
--- a/
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
+++ b/
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
@@
-1,9
+1,10
@@
/* ownCloud Android client application
* Copyright (C) 2012 Bartek Przybylski
/* ownCloud Android client application
* Copyright (C) 2012 Bartek Przybylski
+ * 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
*
* 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
3
of the License, or
+ * 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,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-22,6
+23,7
@@
import java.net.URL;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.HttpStatus;
+import com.owncloud.android.R;
import com.owncloud.android.network.OwnCloudClientUtils;
import eu.alefzero.webdav.WebdavClient;
import com.owncloud.android.network.OwnCloudClientUtils;
import eu.alefzero.webdav.WebdavClient;
@@
-64,13
+66,13
@@
public class AuthenticationRunnable implements Runnable {
postResult(true, uri.toString());
break;
case HttpStatus.SC_UNAUTHORIZED:
postResult(true, uri.toString());
break;
case HttpStatus.SC_UNAUTHORIZED:
- postResult(false,
"Invalid login or/and password"
);
+ postResult(false,
mContext.getString(R.string.auth_unauthorized)
);
break;
case HttpStatus.SC_NOT_FOUND:
break;
case HttpStatus.SC_NOT_FOUND:
- postResult(false,
"Wrong path given"
);
+ postResult(false,
mContext.getString(R.string.auth_not_found)
);
break;
default:
break;
default:
- postResult(false,
"Internal server error, code: " + login_result
);
+ postResult(false,
String.format(mContext.getString(R.string.auth_internal), login_result)
);
}
}
}
}