Revision 4e621cf9 src/com/rackspace/cloud/android/ListAccountsActivity.java
| b/src/com/rackspace/cloud/android/ListAccountsActivity.java | ||
|---|---|---|
| 235 | 235 |
return true; |
| 236 | 236 |
case R.id.login_pithos: |
| 237 | 237 |
|
| 238 |
final CharSequence[] items = {"Pithos+ Dev", "Pithos +"};
|
|
| 238 |
final CharSequence[] items = {"Pithos+ Dev", "Pithos + Staging", "Pithos +"};
|
|
| 239 | 239 |
|
| 240 | 240 |
AlertDialog.Builder builder = new AlertDialog.Builder(this); |
| 241 | 241 |
builder.setTitle("User Or Group");
|
| ... | ... | |
| 245 | 245 |
String auth; |
| 246 | 246 |
Log.d(getClass().getName(),"Item is :"+item); |
| 247 | 247 |
if(item ==0){
|
| 248 |
login="https://pithos.dev.grnet.gr/im/local?next=https://pithos.dev.grnet.gr/ui";
|
|
| 248 |
login=Preferences.LOGIN_PITHOS_DEV_SERVER;
|
|
| 249 | 249 |
auth= Preferences.PITHOS_DEV_SERVER; |
| 250 | 250 |
} |
| 251 |
else if(item ==1){
|
|
| 252 |
login=Preferences.LOGIN_PITHOS_STAGING_SERVER; |
|
| 253 |
auth= Preferences.PITHOS_STAGING_SERVER; |
|
| 254 |
} |
|
| 251 | 255 |
else{
|
| 252 |
login="https://plus.pithos.grnet.gr/im/login";
|
|
| 256 |
login=Preferences.LOGIN_PITHOS_SERVER;
|
|
| 253 | 257 |
auth= Preferences.PITHOS_SERVER; |
| 254 | 258 |
} |
| 255 | 259 |
Intent intent2 = new Intent(ListAccountsActivity.this, PithosLoginActivity.class); |
| 256 | 260 |
//intent2.putExtra("login", "https://pithos.dev.grnet.gr/im/login");
|
| 257 | 261 |
//intent2.putExtra("auth", Preferences.PITHOS_DEV_SERVER);
|
| 262 |
Log.d("LOGIN_URL",login);
|
|
| 263 |
Log.d("LOGIN_AUTH",auth);
|
|
| 258 | 264 |
intent2.putExtra("login", login);
|
| 259 | 265 |
intent2.putExtra("auth", auth);
|
| 260 | 266 |
dialog.dismiss(); |
| ... | ... | |
| 347 | 353 |
else if(authServer.equals(Preferences.PITHOS_SERVER)){
|
| 348 | 354 |
result = "Pithos+"; |
| 349 | 355 |
} |
| 356 |
else if(authServer.equals(Preferences.PITHOS_STAGING_SERVER)){
|
|
| 357 |
result = "Pithos+ Staging"; |
|
| 358 |
} |
|
| 350 | 359 |
else if(authServer.equals(Preferences.PITHOS_DEV_SERVER)){
|
| 351 | 360 |
result = "Pithos+ Dev"; |
| 352 | 361 |
} |
| ... | ... | |
| 370 | 379 |
return R.drawable.rackspacecloud_icon; |
| 371 | 380 |
} |
| 372 | 381 |
if(authServer.equals(Preferences.PITHOS_DEV_SERVER) |
| 373 |
|| authServer.equals(Preferences.PITHOS_SERVER)){
|
|
| 382 |
|| authServer.equals(Preferences.PITHOS_SERVER)|| authServer.equals(Preferences.PITHOS_STAGING_SERVER)){
|
|
| 374 | 383 |
return R.drawable.pithos_icon; |
| 375 | 384 |
} |
| 376 | 385 |
else{
|
Also available in: Unified diff