Revision 4e621cf9

b/src/com/rackspace/cloud/android/AddAccountActivity.java
17 17

  
18 18
public class AddAccountActivity extends CloudActivity implements OnClickListener{
19 19
	
20
	private final String[] PROVIDERS = {"Rackspace Cloud (US)", "Rackspace Cloud (UK)","Pithos+", "Pithos+ Dev","Custom"};
20
	private final String[] PROVIDERS = {"Rackspace Cloud (US)", "Rackspace Cloud (UK)","Pithos +", "Pithos+ Staging", "Pithos+ Dev","Custom"};
21 21
	private EditText usernameText;
22 22
	private EditText passwordText;
23 23
	private EditText customServer;
......
100 100
			        customServer.setEnabled(false);
101 101
				}
102 102
				else if(pos == 3){
103
					authServer = Preferences.PITHOS_STAGING_SERVER;
104
			        customServer.setEnabled(false);
105
				}
106
				else if(pos == 4){
103 107
					authServer = Preferences.PITHOS_DEV_SERVER;
104 108
			        customServer.setEnabled(false);
105 109
				}
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{
b/src/com/rackspace/cloud/android/Preferences.java
32 32
	public static final String COUNTRY_US_AUTH_SERVER_V2 = "https://auth.api.rackspacecloud.com/v2.0";
33 33
    public static final String COUNTRY_UK_AUTH_SERVER_V2 = "https://lon.auth.api.rackspacecloud.com/v2.0";
34 34
	public static final String PITHOS_SERVER = "https://plus.pithos.grnet.gr/v1";
35
	public static final String PITHOS_STAGING_SERVER = "https://plus.pithos.grnet.gr/v1";
35 36
	public static final String PITHOS_DEV_SERVER = "https://pithos.dev.grnet.gr/v1";
37
	
38
	public static final String LOGIN_PITHOS_SERVER = "https://pithos.okeanos.grnet.gr/login?next=https://pithos.okeanos.grnet.gr/ui";
39
	public static final String LOGIN_PITHOS_STAGING_SERVER = "https://pithos.staging.okeanos.grnet.gr/login?next=https://pithos.staging.okeanos.grnet.gr/ui";
40
	public static final String LOGIN_PITHOS_DEV_SERVER = "https://pithos.dev.grnet.gr/login?next=https://pithos.dev.grnet.gr/ui";
36 41

  
37 42
	//Regions
38 43
    public static final String[] US_REGIONS = {"ORD", "DFW"};

Also available in: Unified diff