diff --git a/app/src/main/java/org/iota/wallet/ui/fragment/GenerateQRCodeFragment.java b/app/src/main/java/org/iota/wallet/ui/fragment/GenerateQRCodeFragment.java index 3d8e16a..b41a183 100644 --- a/app/src/main/java/org/iota/wallet/ui/fragment/GenerateQRCodeFragment.java +++ b/app/src/main/java/org/iota/wallet/ui/fragment/GenerateQRCodeFragment.java @@ -39,7 +39,6 @@ import com.google.gson.Gson; -import org.apache.commons.lang3.StringUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.iota.wallet.IOTA; @@ -58,7 +57,6 @@ import butterknife.Unbinder; import jota.error.ArgumentException; import jota.utils.Checksum; -import jota.utils.InputValidator; import jota.utils.IotaUnits; public class GenerateQRCodeFragment extends Fragment { @@ -81,12 +79,8 @@ public class GenerateQRCodeFragment extends Fragment { TextInputEditText messageEditText; @BindView(R.id.generate_qr_code_tag_input) TextInputEditText tagEditText; - @BindView(R.id.generate_qr_code_address_input_aylout) + @BindView(R.id.generate_qr_code_address_input_layout) TextInputLayout addressEditTextInputLayout; - @BindView(R.id.generate_qr_code_message_input_aylout) - TextInputLayout messageEditTextInputLayout; - @BindView(R.id.generate_qr_code_tag_input_aylout) - TextInputLayout tagEditTextInputLayout; @BindView(R.id.generate_qr_code_units_spinner) Spinner unitsSpinner; @@ -138,26 +132,20 @@ public void onGenerateQrCodeClick(FloatingActionButton fab) { inputManager.hideSoftInputFromWindow(fab.getWindowToken(), 0); //reset errors addressEditTextInputLayout.setError(null); - messageEditTextInputLayout.setError(null); - tagEditTextInputLayout.setError(null); + //noinspection StatementWithEmptyBody if (!isValidAddress()) { - } else if (!InputValidator.isTrytes(getMessage(), getMessage().length()) && !getMessage().equals(getMessage().toUpperCase())) { - messageEditTextInputLayout.setError(getString(R.string.messages_invalid_characters)); - - } else if (!InputValidator.isTrytes(getTaG(), getTaG().length()) && !getTaG().equals(getTaG().toUpperCase())) { - tagEditTextInputLayout.setError(getString(R.string.messages_invalid_characters)); - } else { QRCode qrCode = new QRCode(); qrCode.setAddress(addressEditText.getText().toString()); - if (getAmount().isEmpty()) + if (getAmount().isEmpty()) { qrCode.setAmount(""); - else + } else { qrCode.setAmount(amountInSelectedUnit()); + } qrCode.setMessage(messageEditText.getText().toString()); qrCode.setTag(tagEditText.getText().toString()); @@ -312,9 +300,6 @@ private String getMessage() { } private String getTaG() { - if (tagEditText.getText().toString().length() < 27) - return StringUtils.rightPad(tagEditText.getText().toString(), 27, '9'); - else return tagEditText.getText().toString(); } } diff --git a/app/src/main/java/org/iota/wallet/ui/fragment/NewTransferFragment.java b/app/src/main/java/org/iota/wallet/ui/fragment/NewTransferFragment.java index e1a8f46..ec7bb45 100644 --- a/app/src/main/java/org/iota/wallet/ui/fragment/NewTransferFragment.java +++ b/app/src/main/java/org/iota/wallet/ui/fragment/NewTransferFragment.java @@ -65,7 +65,6 @@ import butterknife.Unbinder; import jota.error.ArgumentException; import jota.utils.Checksum; -import jota.utils.InputValidator; import jota.utils.IotaUnitConverter; import jota.utils.IotaUnits; @@ -92,10 +91,6 @@ public class NewTransferFragment extends Fragment { TextInputLayout addressEditTextInputLayout; @BindView(R.id.new_transfer_amount_text_input_layout) TextInputLayout amountEditTextInputLayout; - @BindView(R.id.new_transfer_message_text_input_layout) - TextInputLayout messageEditTextInputLayout; - @BindView(R.id.new_transfer_tag_input_layout) - TextInputLayout tagEditTextInputLayout; @BindView(R.id.new_transfer_units_spinner) Spinner unitsSpinner; @@ -171,10 +166,9 @@ public void onNewTransferSendFabClick(FloatingActionButton fab) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); addressEditTextInputLayout.setError(null); - tagEditTextInputLayout.setError(null); amountEditTextInputLayout.setError(null); - messageEditTextInputLayout.setError(null); + //noinspection StatementWithEmptyBody if (!isValidAddress()) { } else if (getAmount().isEmpty() || getAmount().equals("0")) { @@ -183,15 +177,6 @@ public void onNewTransferSendFabClick(FloatingActionButton fab) { } else if (prefs.getLong(Constants.PREFERENCES_CURRENT_IOTA_BALANCE, 0) < Long.parseLong(amountInSelectedUnit())) { amountEditTextInputLayout.setError(getString(R.string.messages_not_enough_balance)); - } else if (!InputValidator.isTrytes(getMessage(), getMessage().length()) && !getMessage().equals(getMessage().toUpperCase())) { - messageEditTextInputLayout.setError(getString(R.string.messages_invalid_characters)); - - } else if (!InputValidator.isTrytes(getTaG(), getTaG().length()) && !getTaG().equals(getTaG().toUpperCase())) { - tagEditTextInputLayout.setError(getString(R.string.messages_invalid_characters)); - - } else if (getTaG().length() > 27) { - tagEditTextInputLayout.setError(getString(R.string.messages_tag_to_long)); - } else { AlertDialog alertDialog = new AlertDialog.Builder(getActivity()) .setMessage(R.string.message_confirm_transfer) @@ -400,11 +385,10 @@ private String getMessage() { } private String getTaG() { - if (tagEditText.getText().toString().isEmpty()) + if (tagEditText.getText().toString().isEmpty()) { return Constants.NEW_TRANSFER_TAG; - else if (tagEditText.getText().toString().length() < 27) + } else if (tagEditText.getText().toString().length() < 27) return StringUtils.rightPad(tagEditText.getText().toString(), 27, '9'); - else - return tagEditText.getText().toString(); + return tagEditText.getText().toString(); } } \ No newline at end of file diff --git a/app/src/main/java/org/iota/wallet/ui/fragment/SeedLoginFragment.java b/app/src/main/java/org/iota/wallet/ui/fragment/SeedLoginFragment.java index e3e3fa0..33277c6 100644 --- a/app/src/main/java/org/iota/wallet/ui/fragment/SeedLoginFragment.java +++ b/app/src/main/java/org/iota/wallet/ui/fragment/SeedLoginFragment.java @@ -113,14 +113,16 @@ public boolean onSeedLoginSeedInputEditorAction(int actionId, KeyEvent event) { private void loginDialog() { - if (seedEditText.getText().toString().isEmpty()) { + //TODO Only accept seeds that are longer than SeedValidator.SEED_LENGTH_MIN ? + + String seed = seedEditText.getText().toString(); + + if (seed.isEmpty()) { seedEditTextLayout.setError(getString(R.string.messages_empty_seed)); if (seedEditTextLayout.getError() != null) return; } - String seed = seedEditText.getText().toString(); - if (SeedValidator.isSeedValid(getActivity(), seed) == null) { login(); diff --git a/app/src/main/res/layout/fragment_generate_qr.xml b/app/src/main/res/layout/fragment_generate_qr.xml index 3b99c76..0451fdf 100644 --- a/app/src/main/res/layout/fragment_generate_qr.xml +++ b/app/src/main/res/layout/fragment_generate_qr.xml @@ -34,7 +34,7 @@ diff --git a/app/src/main/res/layout/fragment_neighbors.xml b/app/src/main/res/layout/fragment_neighbors.xml index 8559d03..42d50a6 100644 --- a/app/src/main/res/layout/fragment_neighbors.xml +++ b/app/src/main/res/layout/fragment_neighbors.xml @@ -53,7 +53,6 @@ android:paddingRight="@dimen/baseline" tools:visibility="gone"> - @@ -74,6 +75,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:hint="@string/amount" + android:maxLength="16" android:inputType="numberSigned" />