diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml index e7481aac0..fc800c5e0 100755 --- a/android/res/xml/preferences.xml +++ b/android/res/xml/preferences.xml @@ -102,7 +102,8 @@ --> - + diff --git a/android/src/com/google/zxing/client/android/DecodeHintManager.java b/android/src/com/google/zxing/client/android/DecodeHintManager.java index d8b49ce33..fa215b5ad 100644 --- a/android/src/com/google/zxing/client/android/DecodeHintManager.java +++ b/android/src/com/google/zxing/client/android/DecodeHintManager.java @@ -172,7 +172,7 @@ final class DecodeHintManager { if (hintType.getValueType().equals(int[].class)) { // An integer array. Used to specify valid lengths. // Strip a trailing comma as in Java style array initialisers. - if (parameterText.length() > 0 && parameterText.charAt(parameterText.length() - 1) == ',') { + if (!parameterText.isEmpty() && parameterText.charAt(parameterText.length() - 1) == ',') { parameterText = parameterText.substring(0, parameterText.length() - 1); } String[] values = COMMA.split(parameterText); diff --git a/android/src/com/google/zxing/client/android/share/ShareActivity.java b/android/src/com/google/zxing/client/android/share/ShareActivity.java index ebaaa6ced..837c41bf5 100755 --- a/android/src/com/google/zxing/client/android/share/ShareActivity.java +++ b/android/src/com/google/zxing/client/android/share/ShareActivity.java @@ -98,7 +98,7 @@ public final class ShareActivity extends Activity { public boolean onKey(View view, int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_DOWN) { String text = ((TextView) view).getText().toString(); - if (text != null && text.length() > 0) { + if (text != null && !text.isEmpty()) { launchSearch(text); } return true;