projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filter only '/' character in user input when version of server is 8.1 or later
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
PassCodeActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/PassCodeActivity.java
b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
index
f6b5aff
..
00cf1f0
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/
src/com/owncloud/android/ui/activity/PassCodeActivity.java
@@
-273,8
+273,7
@@
public class PassCodeActivity extends SherlockFragmentActivity {
finish();
} else {
finish();
} else {
- showErrorAndRestart(R.string.common_error, R.string.pass_code_enter_pass_code, View.INVISIBLE);
- /// TODO better error message
+ showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code, View.INVISIBLE);
}
} else if (ACTION_DISABLE.equals(getIntent().getAction())) {
}
} else if (ACTION_DISABLE.equals(getIntent().getAction())) {
@@
-289,8
+288,7
@@
public class PassCodeActivity extends SherlockFragmentActivity {
finish();
} else {
finish();
} else {
- showErrorAndRestart(R.string.common_error, R.string.pass_code_enter_pass_code, View.INVISIBLE);
- /// TODO better error message
+ showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code, View.INVISIBLE);
}
} else if (ACTION_ENABLE.equals(getIntent().getAction())) {
}
} else if (ACTION_ENABLE.equals(getIntent().getAction())) {