Revision ffd154e6 src/com/rackspacecloud/android/AddMoreNodesActivity.java
| b/src/com/rackspacecloud/android/AddMoreNodesActivity.java | ||
|---|---|---|
| 490 | 490 |
return ""; |
| 491 | 491 |
} |
| 492 | 492 |
|
| 493 |
private boolean isCloudServerIp(String address){
|
|
| 493 |
private boolean ipInList(String address){
|
|
| 494 | 494 |
for(Server s : possibleNodes){
|
| 495 | 495 |
if(serverHasIp(s, address)){
|
| 496 | 496 |
return true; |
| ... | ... | |
| 573 | 573 |
* If the ip is from a cloud server, alert to user |
| 574 | 574 |
* so they can select it from there |
| 575 | 575 |
*/ |
| 576 |
if(!isCloudServerIp(node.getAddress())){
|
|
| 576 |
if(!ipInList(node.getAddress())){
|
|
| 577 | 577 |
|
| 578 | 578 |
if(positionOfNode >= 0){
|
| 579 | 579 |
nodesToAdd.remove(positionOfNode); |
| ... | ... | |
| 588 | 588 |
possibleNodes.add(server); |
| 589 | 589 |
setServerList(possibleNodes); |
| 590 | 590 |
} else {
|
| 591 |
showAlert("Error", "This IP belongs to a cloud server: \"" + getNameFromIp(node.getAddress())
|
|
| 592 |
+ "\", please select it from the list."); |
|
| 591 |
String name = getNameFromIp(node.getAddress()); |
|
| 592 |
if(name.equals("External Node")){
|
|
| 593 |
showAlert("Error", "This IP has already been added as an external node, please edit" +
|
|
| 594 |
"it from the list."); |
|
| 595 |
} else {
|
|
| 596 |
showAlert("Error", "This IP belongs to a cloud server: \"" + getNameFromIp(node.getAddress())
|
|
| 597 |
+ "\", please edit it from the list."); |
|
| 598 |
} |
|
| 593 | 599 |
} |
| 594 | 600 |
} |
| 595 | 601 |
printTheNodes(); |
Also available in: Unified diff