moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-08-13 16:53:50 -04:00
Code Issues Releases Wiki Activity

Allow chars '[' and ']' in ident

Browse Source
This commit is contained in:
Sebastian Kaspari 2010-12-17 23:37:00 +01:00
parent aaa313e805
commit e0b4b3d25d
1 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
application/src/org/yaaic/activity/AddServerActivity.java
View File

@ -17,13 +17,22 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
package org.yaaic.activity;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.regex.Pattern;
import org.yaaic.R;
import org.yaaic.Yaaic;
import org.yaaic.db.Database;
import org.yaaic.exception.ValidationException;
import org.yaaic.model.Extra;
import org.yaaic.model.Identity;
import org.yaaic.model.Server;
import org.yaaic.model.Status;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
@ -37,15 +46,6 @@ import android.widget.EditText;
import android.widget.Spinner;
import android.widget.Toast;
import org.yaaic.R;
import org.yaaic.Yaaic;
import org.yaaic.db.Database;
import org.yaaic.exception.ValidationException;
import org.yaaic.model.Extra;
import org.yaaic.model.Identity;
import org.yaaic.model.Server;
import org.yaaic.model.Status;
/**
* Add a new server to the list
*
@ -157,6 +157,7 @@ public class AddServerActivity extends Activity implements OnClickListener
/**
* On click add server or cancel activity
*/
@Override
public void onClick(View v)
{
switch (v.getId()) {
@ -189,11 +190,11 @@ public class AddServerActivity extends Activity implements OnClickListener
} catch(ValidationException e) {
Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
}
break;
break;
case R.id.cancel:
setResult(RESULT_CANCELED);
finish();
break;
break;
}
}
@ -407,7 +408,7 @@ public class AddServerActivity extends Activity implements OnClickListener
}
// We currently only allow chars and numbers as ident
Pattern identPattern = Pattern.compile("^[a-zA-Z0-9]+$");
Pattern identPattern = Pattern.compile("^[a-zA-Z0-9\\[\\]]+$");
if (!identPattern.matcher(ident).matches()) {
throw new ValidationException(getResources().getString(R.string.validation_invalid_ident));
}