Revision 008df6cf

b/gen/com/rackspacecloud/android/R.java
9 9 

  		





  10
  10
  
    
public final class R {


  		





  11
  11
  
    
    public static final class array {


  		





  12
  
  
    
        public static final int cdn=0x7f050002;


  		





  13
  
  
    
        public static final int country_entries=0x7f050003;


  		





  14
  
  
    
        public static final int country_values=0x7f050004;


  		





  15
  
  
    
        public static final int logRet=0x7f050001;


  		





  16
  
  
    
        public static final int ttl=0x7f050000;


  		





  
  12
  
    
        public static final int cdn=0x7f040002;


  		





  
  13
  
    
        public static final int country_entries=0x7f040003;


  		





  
  14
  
    
        public static final int country_values=0x7f040004;


  		





  
  15
  
    
        public static final int logRet=0x7f040001;


  		





  
  16
  
    
        public static final int ttl=0x7f040000;


  		





  17
  17
  
    
    }


  		





  18
  18
  
    
    public static final class attr {


  		





  19
  19
  
    
    }


  		





  ......




  48
  48
  
    
        public static final int windows_large=0x7f02001b;


  		





  49
  49
  
    
    }


  		





  50
  50
  
    
    public static final class id {


  		





  51
  
  
    
        public static final int add_container=0x7f080032;


  		





  52
  
  
    
        public static final int add_server=0x7f080035;


  		





  53
  
  
    
        public static final int button=0x7f080016;


  		





  54
  
  
    
        public static final int cdn_spinner=0x7f080009;


  		





  55
  
  
    
        public static final int container_name=0x7f080000;


  		





  56
  
  
    
        public static final int delete_container=0x7f080036;


  		





  57
  
  
    
        public static final int delete_object=0x7f080034;


  		





  58
  
  
    
        public static final int disable_button=0x7f08000d;


  		





  59
  
  
    
        public static final int enable_button=0x7f08000c;


  		





  60
  
  
    
        public static final int enable_cdn=0x7f080037;


  		





  61
  
  
    
        public static final int flavor_spinner=0x7f080006;


  		





  62
  
  
    
        public static final int icon=0x7f080010;


  		





  63
  
  
    
        public static final int image_spinner=0x7f080005;


  		





  64
  
  
    
        public static final int label=0x7f08000e;


  		





  65
  
  
    
        public static final int list=0x7f080011;


  		





  66
  
  
    
        public static final int loading_label=0x7f080013;


  		





  67
  
  
    
        public static final int loading_progress_bar=0x7f080012;


  		





  68
  
  
    
        public static final int log_retention_spinner=0x7f08000b;


  		





  69
  
  
    
        public static final int login_apikey=0x7f080015;


  		





  70
  
  
    
        public static final int login_authenticating_label=0x7f080018;


  		





  71
  
  
    
        public static final int login_progress_bar=0x7f080017;


  		





  72
  
  
    
        public static final int login_username=0x7f080014;


  		





  73
  
  
    
        public static final int no_containers_label=0x7f080019;


  		





  74
  
  
    
        public static final int no_containers_sublabel=0x7f08001a;


  		





  75
  
  
    
        public static final int no_files_label=0x7f08001b;


  		





  76
  
  
    
        public static final int no_files_sublabel=0x7f08001c;


  		





  77
  
  
    
        public static final int no_servers_label=0x7f08001d;


  		





  78
  
  
    
        public static final int no_servers_sublabel=0x7f08001e;


  		





  79
  
  
    
        public static final int preview_button=0x7f080027;


  		





  80
  
  
    
        public static final int refresh=0x7f080033;


  		





  81
  
  
    
        public static final int save_button=0x7f080001;


  		





  82
  
  
    
        public static final int save_container_progress_bar=0x7f080002;


  		





  83
  
  
    
        public static final int save_server_progress_bar=0x7f080007;


  		





  84
  
  
    
        public static final int saving_container_label=0x7f080003;


  		





  85
  
  
    
        public static final int saving_server_label=0x7f080008;


  		





  86
  
  
    
        public static final int server_name=0x7f080004;


  		





  87
  
  
    
        public static final int sublabel=0x7f08000f;


  		





  88
  
  
    
        public static final int tab1=0x7f080020;


  		





  89
  
  
    
        public static final int tab2=0x7f080021;


  		





  90
  
  
    
        public static final int tabhost=0x7f08001f;


  		





  91
  
  
    
        public static final int ttl_spinner=0x7f08000a;


  		





  92
  
  
    
        public static final int view_container_name=0x7f080023;


  		





  93
  
  
    
        public static final int view_content_type=0x7f080025;


  		





  94
  
  
    
        public static final int view_file_bytes=0x7f080024;


  		





  95
  
  
    
        public static final int view_file_modification=0x7f080026;


  		





  96
  
  
    
        public static final int view_server_delete_button=0x7f080031;


  		





  97
  
  
    
        public static final int view_server_disk=0x7f08002c;


  		





  98
  
  
    
        public static final int view_server_hard_reboot_button=0x7f08002f;


  		





  99
  
  
    
        public static final int view_server_layout=0x7f080022;


  		





  100
  
  
    
        public static final int view_server_memory=0x7f08002b;


  		





  101
  
  
    
        public static final int view_server_name=0x7f080029;


  		





  102
  
  
    
        public static final int view_server_os=0x7f08002a;


  		





  103
  
  
    
        public static final int view_server_os_logo=0x7f080028;


  		





  104
  
  
    
        public static final int view_server_resize_button=0x7f080030;


  		





  105
  
  
    
        public static final int view_server_soft_reboot_button=0x7f08002e;


  		





  106
  
  
    
        public static final int view_server_status=0x7f08002d;


  		





  
  51
  
    
        public static final int add_container=0x7f070032;


  		





  
  52
  
    
        public static final int add_server=0x7f070035;


  		





  
  53
  
    
        public static final int button=0x7f070016;


  		





  
  54
  
    
        public static final int cdn_spinner=0x7f070009;


  		





  
  55
  
    
        public static final int container_name=0x7f070000;


  		





  
  56
  
    
        public static final int delete_container=0x7f070036;


  		





  
  57
  
    
        public static final int delete_object=0x7f070034;


  		





  
  58
  
    
        public static final int disable_button=0x7f07000d;


  		





  
  59
  
    
        public static final int enable_button=0x7f07000c;


  		





  
  60
  
    
        public static final int enable_cdn=0x7f070037;


  		





  
  61
  
    
        public static final int flavor_spinner=0x7f070006;


  		





  
  62
  
    
        public static final int icon=0x7f070010;


  		





  
  63
  
    
        public static final int image_spinner=0x7f070005;


  		





  
  64
  
    
        public static final int label=0x7f07000e;


  		





  
  65
  
    
        public static final int list=0x7f070011;


  		





  
  66
  
    
        public static final int loading_label=0x7f070013;


  		





  
  67
  
    
        public static final int loading_progress_bar=0x7f070012;


  		





  
  68
  
    
        public static final int log_retention_spinner=0x7f07000b;


  		





  
  69
  
    
        public static final int login_apikey=0x7f070015;


  		





  
  70
  
    
        public static final int login_authenticating_label=0x7f070018;


  		





  
  71
  
    
        public static final int login_progress_bar=0x7f070017;


  		





  
  72
  
    
        public static final int login_username=0x7f070014;


  		





  
  73
  
    
        public static final int no_containers_label=0x7f070019;


  		





  
  74
  
    
        public static final int no_containers_sublabel=0x7f07001a;


  		





  
  75
  
    
        public static final int no_files_label=0x7f07001b;


  		





  
  76
  
    
        public static final int no_files_sublabel=0x7f07001c;


  		





  
  77
  
    
        public static final int no_servers_label=0x7f07001d;


  		





  
  78
  
    
        public static final int no_servers_sublabel=0x7f07001e;


  		





  
  79
  
    
        public static final int preview_button=0x7f070027;


  		





  
  80
  
    
        public static final int refresh=0x7f070033;


  		





  
  81
  
    
        public static final int save_button=0x7f070001;


  		





  
  82
  
    
        public static final int save_container_progress_bar=0x7f070002;


  		





  
  83
  
    
        public static final int save_server_progress_bar=0x7f070007;


  		





  
  84
  
    
        public static final int saving_container_label=0x7f070003;


  		





  
  85
  
    
        public static final int saving_server_label=0x7f070008;


  		





  
  86
  
    
        public static final int server_name=0x7f070004;


  		





  
  87
  
    
        public static final int sublabel=0x7f07000f;


  		





  
  88
  
    
        public static final int tab1=0x7f070020;


  		





  
  89
  
    
        public static final int tab2=0x7f070021;


  		





  
  90
  
    
        public static final int tabhost=0x7f07001f;


  		





  
  91
  
    
        public static final int ttl_spinner=0x7f07000a;


  		





  
  92
  
    
        public static final int view_container_name=0x7f070023;


  		





  
  93
  
    
        public static final int view_content_type=0x7f070025;


  		





  
  94
  
    
        public static final int view_file_bytes=0x7f070024;


  		





  
  95
  
    
        public static final int view_file_modification=0x7f070026;


  		





  
  96
  
    
        public static final int view_server_delete_button=0x7f070031;


  		





  
  97
  
    
        public static final int view_server_disk=0x7f07002c;


  		





  
  98
  
    
        public static final int view_server_hard_reboot_button=0x7f07002f;


  		





  
  99
  
    
        public static final int view_server_layout=0x7f070022;


  		





  
  100
  
    
        public static final int view_server_memory=0x7f07002b;


  		





  
  101
  
    
        public static final int view_server_name=0x7f070029;


  		





  
  102
  
    
        public static final int view_server_os=0x7f07002a;


  		





  
  103
  
    
        public static final int view_server_os_logo=0x7f070028;


  		





  
  104
  
    
        public static final int view_server_resize_button=0x7f070030;


  		





  
  105
  
    
        public static final int view_server_soft_reboot_button=0x7f07002e;


  		





  
  106
  
    
        public static final int view_server_status=0x7f07002d;


  		





  107
  107
  
    
    }


  		





  108
  108
  
    
    public static final class layout {


  		





  109
  109
  
    
        public static final int createcontainer=0x7f030000;


  		





  ......




  118
  118
  
    
        public static final int nocontainerscell=0x7f030009;


  		





  119
  119
  
    
        public static final int noobjectscell=0x7f03000a;


  		





  120
  120
  
    
        public static final int noserverscell=0x7f03000b;


  		





  121
  
  
    
        public static final int tabview=0x7f03000c;


  		





  122
  
  
    
        public static final int viewobject=0x7f03000d;


  		





  123
  
  
    
        public static final int viewserver=0x7f03000e;


  		





  
  121
  
    
        public static final int preferences=0x7f03000c;


  		





  
  122
  
    
        public static final int tabview=0x7f03000d;


  		





  
  123
  
    
        public static final int viewobject=0x7f03000e;


  		





  
  124
  
    
        public static final int viewserver=0x7f03000f;


  		





  124
  125
  
    
    }


  		





  125
  126
  
    
    public static final class menu {


  		





  126
  
  
    
        public static final int container_list_menu=0x7f070000;


  		





  127
  
  
    
        public static final int container_object_list_menu=0x7f070001;


  		





  128
  
  
    
        public static final int servers_list_menu=0x7f070002;


  		





  129
  
  
    
        public static final int view_container_object_list_menu=0x7f070003;


  		





  
  127
  
    
        public static final int container_list_menu=0x7f060000;


  		





  
  128
  
    
        public static final int container_object_list_menu=0x7f060001;


  		





  
  129
  
    
        public static final int servers_list_menu=0x7f060002;


  		





  
  130
  
    
        public static final int view_container_object_list_menu=0x7f060003;


  		





  130
  131
  
    
    }


  		





  131
  132
  
    
    public static final class string {


  		





  132
  
  
    
        public static final int apikey=0x7f060003;


  		





  133
  
  
    
        public static final int app_name=0x7f060001;


  		





  134
  
  
    
        public static final int authenticating=0x7f060005;


  		





  135
  
  
    
        public static final int country=0x7f060009;


  		





  136
  
  
    
        public static final int country_default_value=0x7f06000a;


  		





  137
  
  
    
        public static final int fields_missing=0x7f060006;


  		





  138
  
  
    
        public static final int hello=0x7f060000;


  		





  139
  
  
    
        public static final int login=0x7f060004;


  		





  140
  
  
    
        public static final int ok=0x7f060008;


  		





  141
  
  
    
        public static final int preference_name=0x7f06000b;


  		





  142
  
  
    
        public static final int username=0x7f060002;


  		





  143
  
  
    
        public static final int username_and_apikey_required=0x7f060007;


  		





  144
  
  
    
    }


  		





  145
  
  
    
    public static final class xml {


  		





  146
  
  
    
        public static final int preferences=0x7f040000;


  		





  
  133
  
    
        public static final int apikey=0x7f050003;


  		





  
  134
  
    
        public static final int app_name=0x7f050001;


  		





  
  135
  
    
        public static final int authenticating=0x7f050005;


  		





  
  136
  
    
        public static final int country=0x7f050009;


  		





  
  137
  
    
        public static final int country_default_value=0x7f05000a;


  		





  
  138
  
    
        public static final int fields_missing=0x7f050006;


  		





  
  139
  
    
        public static final int hello=0x7f050000;


  		





  
  140
  
    
        public static final int login=0x7f050004;


  		





  
  141
  
    
        public static final int ok=0x7f050008;


  		





  
  142
  
    
        public static final int preference_name=0x7f05000b;


  		





  
  143
  
    
        public static final int username=0x7f050002;


  		





  
  144
  
    
        public static final int username_and_apikey_required=0x7f050007;


  		





  147
  145
  
    
    }


  		





  148
  146
  
    
}


  		












  

    
      b/res/layout/preferences.xml
    
  






  1
  1
  
    
<?xml version="1.0" encoding="utf-8"?>


  		





  2
  2
  
    
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">


  		





  3
  3
  
    
	<PreferenceCategory android:title="Geographical Location">


  		





  4
  
  
    
	


  		





  
  4
  
    

  		





  5
  5
  
    
		<ListPreference android:key="countries_type"


  		





  6
  6
  
    
			android:title="@string/country" android:entries="@array/country_entries"


  		





  7
  7
  
    
			android:entryValues="@array/country_values" android:dialogTitle="@string/country"


  		





  8
  8
  
    
			android:defaultValue="@string/country_default_value" />


  		





  9
  9
  
    
	</PreferenceCategory>


  		





  10
  
  
    
	


  		





  
  10
  
    

  		





  
  11
  
    
	<PreferenceCategory android:title="Authentication">


  		





  
  12
  
    
		<EditTextPreference android:name="Authentication Preference"


  		





  
  13
  
    
			android:summary="Enter a custom auth server URL."


  		





  
  14
  
    
			android:defaultValue="http://" android:title="Auth Server URL"


  		





  
  15
  
    
			android:key="authServerPref" />


  		





  
  16
  
    
	</PreferenceCategory>


  		





  
  17
  
    

  		





  
  18
  
    

  		





  11
  19
  
    
</PreferenceScreen>


  		












  

    
      b/src/com/rackspacecloud/android/Preferences.java
    
  






  11
  11
  
    
    // Identical to the value specified in res/values/strings.xml.


  		





  12
  12
  
    
    public static final String PREF_KEY_RESULTS_TYPE = "countries_type";


  		





  13
  13
  
    

  		





  
  14
  
    
    // The key to the Auth Server preference.


  		





  
  15
  
    
    public static final String PREF_KEY_AUTH_SERVER = "authServerPref";


  		





  
  16
  
    

  		





  14
  17
  
    
    // The values of the preferences for the type of results to show (us/uk).


  		





  15
  18
  
    
    // Identical to the values specified in res/values/strings.xml.


  		





  16
  19
  
    
    public static final int COUNTRY_US = 0;


  		





  ......




  19
  22
  
    
    //Define auth server here


  		





  20
  23
  
    
    public static final String COUNTRY_US_AUTH_SERVER = "https://auth.api.rackspacecloud.com/v1.0";


  		





  21
  24
  
    
    public static final String COUNTRY_UK_AUTH_SERVER = "https://lon.auth.api.rackspacecloud.com/v1.0";


  		





  
  25
  
    

  		





  22
  26
  
    
    


  		





  23
  27
  
    
	protected void onCreate(Bundle savedInstanceState) {


  		





  24
  28
  
    
		super.onCreate(savedInstanceState);


  		





  25
  29
  
    
        getPreferenceManager().setSharedPreferencesName(SHARED_PREFERENCES_NAME);


  		





  26
  
  
    
		addPreferencesFromResource(R.xml.preferences);


  		





  
  30
  
    
		addPreferencesFromResource(R.layout.preferences);


  		





  27
  31
  
    
	}


  		





  28
  32
  
    
}


  		












  

    
      b/src/com/rackspacecloud/android/RackspaceCloudActivity.java
    
  






  132
  132
  
    
                String.valueOf(Preferences.COUNTRY_US));


  		





  133
  133
  
    
        int resultTypeInt = Integer.parseInt(resultType);


  		





  134
  134
  
    
        


  		





  
  135
  
    
        


  		





  135
  136
  
    
        //Default Auth Server


  		





  136
  137
  
    
        String authServer = Preferences.COUNTRY_US_AUTH_SERVER; 


  		





  137
  138
  
    
        if (resultTypeInt == Preferences.COUNTRY_UK)


  		





  138
  139
  
    
        	authServer = Preferences.COUNTRY_UK_AUTH_SERVER;


  		





  139
  140
  
    
        


  		





  
  141
  
    
        String customAuthServer = prefs.getString(Preferences.PREF_KEY_AUTH_SERVER, "http://");


  		





  
  142
  
    
        if (!customAuthServer.equals("http://"))


  		





  
  143
  
    
        	authServer = customAuthServer;


  		





  
  144
  
    
        


  		





  
  145
  
    
        Log.d("RackSpace-Cloud", "Using AuthServer: " + authServer);


  		





  
  146
  
    
        


  		





  140
  147
  
    
    	String username = ((EditText) findViewById(R.id.login_username)).getText().toString();


  		





  141
  148
  
    
    	String apiKey = ((EditText) findViewById(R.id.login_apikey)).getText().toString();


  		





  142
  149
  
    
    	Account.setUsername(username);


  		












Also available in:
  Unified diff