Moved name for new user button to strings.xml. Fixed exceptions in Ad…

…dUserActivity.java.
chaosdorf · Oct 29, 2013 · 3a6409b · 3a6409b
1 parent 1b2a9b9
commit 3a6409b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java b/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java
@@ -44,7 +44,7 @@ public void onClick(View view)
 				final CharSequence username = usernameText.getText();
 				final CharSequence email = emailText.getText();
 				final CharSequence balance = balanceText.getText();
-				if (username == null)
+				if (username == null || username.length() == 0)
 				{
 					Utility.displayToastMessage(activity, getResources().getString(R.string.add_user_empty_username));
 					return;
@@ -54,12 +54,21 @@ public void onClick(View view)
 				{
 					emailValue = email.toString();
 				}
-				if (balance == null)
+				if (balance == null || balance.length() == 0)
+				{
+					Utility.displayToastMessage(activity, getResources().getString(R.string.add_user_empty_balance));
+					return;
+				}
+				double balanceValue;
+				try
+				{
+					balanceValue = Double.parseDouble(balance.toString());
+				}
+				catch (NumberFormatException ignored)
 				{
 					Utility.displayToastMessage(activity, getResources().getString(R.string.add_user_empty_balance));
 					return;
 				}
-				final double balanceValue = Double.parseDouble(balance.toString());
 				final User user = new User(0,
 						username.toString(),
 						emailValue,

diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java b/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java
@@ -147,7 +147,7 @@ public void processIOResult(final LongRunningIOTask task, final String json)
 		if (task == LongRunningIOTask.GET_USERS && json != null)
 		{
 			final List<User> itemList = UserController.parseAllUsersFromJSON(json);
-			itemList.add(new User(NEW_USER_ID, "Neuer Benutzer", "", 0, new Date(), new Date()));
+			itemList.add(new User(NEW_USER_ID, getResources().getString(R.string.pick_username_new_user), "", 0, new Date(), new Date()));
 			final UserAdapter userAdapter = new UserAdapter(itemList);
 
 			gridView.setAdapter(userAdapter);

diff --git a/meteroid/src/main/res/values/strings.xml b/meteroid/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
 
     <!-- Pick username -->
     <string name="pick_username_label">Pick your username</string>
+    <string name="pick_username_new_user">New</string>
     <string name="pick_username_error">Could not load user list. Please check network connection or
         reset hostname to proceed.
     </string>