Revision fe23daac
| b/AndroidManifest.xml | ||
|---|---|---|
| 80 | 80 |
<category android:name="android.intent.category.APPLICATION" /> |
| 81 | 81 |
</intent-filter> |
| 82 | 82 |
</activity> |
| 83 |
|
|
| 83 |
|
|
| 84 |
<activity android:name=".ActivityChooser" android:label="@string/app_name"> |
|
| 85 |
<intent-filter> |
|
| 86 |
<action android:name="android.intent.action.MAIN"/> |
|
| 87 |
<category android:name="android.intent.category.APPLICATION"/> |
|
| 88 |
</intent-filter> |
|
| 89 |
</activity> |
|
| 90 |
<activity android:name=".LoadBalancersActivity" android:label="@string/app_name"> |
|
| 91 |
<intent-filter> |
|
| 92 |
<action android:name="android.intent.action.MAIN"/> |
|
| 93 |
<category android:name="android.intent.category.APPLICATION"/> |
|
| 94 |
</intent-filter> |
|
| 95 |
</activity> |
|
| 96 |
<activity android:name=".ListLoadBalancersActivity" android:label="@string/app_name"> |
|
| 97 |
<intent-filter> |
|
| 98 |
<action android:name="android.intent.action.MAIN"/> |
|
| 99 |
<category android:name="android.intent.category.APPLICATION"/> |
|
| 100 |
</intent-filter> |
|
| 101 |
</activity> |
|
| 102 |
<activity android:name=".LoadBalancersActivity" android:label="@string/app_name"> |
|
| 103 |
<intent-filter> |
|
| 104 |
<action android:name="android.intent.action.MAIN"/> |
|
| 105 |
<category android:name="android.intent.category.APPLICATION"/> |
|
| 106 |
</intent-filter> |
|
| 107 |
</activity> |
|
| 108 |
<activity android:name=".ViewLoadBalancerActivity" android:label="@string/app_name"> |
|
| 109 |
<intent-filter> |
|
| 110 |
<action android:name="android.intent.action.MAIN"/> |
|
| 111 |
<category android:name="android.intent.category.APPLICATION"/> |
|
| 112 |
</intent-filter> |
|
| 113 |
</activity> |
|
| 114 |
|
|
| 115 |
|
|
| 84 | 116 |
<activity android:name=".Preferences" android:label="@string/preference_name" /> |
| 85 | 117 |
<activity android:name=".BackupServerActivity"></activity> |
| 86 | 118 |
<activity android:name=".PasswordServerActivity"></activity> |
| b/src/com/rackspace/cloud/servers/api/client/Account.java | ||
|---|---|---|
| 3 | 3 |
*/ |
| 4 | 4 |
package com.rackspace.cloud.servers.api.client; |
| 5 | 5 |
|
| 6 |
import com.rackspace.cloud.utils.StringUtils; |
|
| 7 |
|
|
| 6 | 8 |
|
| 7 | 9 |
|
| 8 | 10 |
/** |
| ... | ... | |
| 17 | 19 |
private static final long serialVersionUID = 2180740077014156769L; |
| 18 | 20 |
private String username; |
| 19 | 21 |
private String apiKey; |
| 22 |
private String accountId; |
|
| 20 | 23 |
private transient String authToken; |
| 21 | 24 |
private String authServer; |
| 22 | 25 |
private transient String serverUrl; |
| 23 | 26 |
private transient String storageUrl; |
| 27 |
private String loadBalancerDFWUrl; |
|
| 28 |
private String loadBalancerORDUrl; |
|
| 29 |
private String loadBalancerUKUrl; |
|
| 24 | 30 |
private transient String storageToken; |
| 25 | 31 |
private transient String cdnManagementUrl; |
| 26 | 32 |
private transient static Account currentAccount; |
| ... | ... | |
| 108 | 114 |
public void setAuthServer(String authServer) {
|
| 109 | 115 |
this.authServer = authServer; |
| 110 | 116 |
} |
| 111 |
|
|
| 112 | 117 |
|
| 118 |
//auth v1.1 should return loadbalancer endpoints and return account id .... |
|
| 119 |
public String getAccountId() {
|
|
| 120 |
String delemiter = "v1.0/"; |
|
| 121 |
int indexToReturn = 1; |
|
| 122 |
accountId = StringUtils.splitByDelemiter(getServerUrl(), delemiter, indexToReturn); |
|
| 123 |
return accountId; |
|
| 124 |
} |
|
| 125 |
|
|
| 126 |
/** |
|
| 127 |
* @return the loadBalancerDFWUrl |
|
| 128 |
*/ |
|
| 129 |
public String getLoadBalancerDFWUrl() {
|
|
| 130 |
loadBalancerDFWUrl = "https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/"; |
|
| 131 |
return loadBalancerDFWUrl; |
|
| 132 |
} |
|
| 133 |
|
|
| 134 |
/** |
|
| 135 |
* @param loadBalancerDFWUrl the loadBalancerDFWUrl to set |
|
| 136 |
*/ |
|
| 137 |
public void setLoadBalancerDFWUrl(String loadBalancerDFWUrl) {
|
|
| 138 |
this.loadBalancerDFWUrl = loadBalancerDFWUrl; |
|
| 139 |
} |
|
| 140 |
|
|
| 141 |
/** |
|
| 142 |
* @return the loadBalancerORDUrl |
|
| 143 |
*/ |
|
| 144 |
public String getLoadBalancerORDUrl() {
|
|
| 145 |
loadBalancerORDUrl = "https://ord.loadbalancers.api.rackspacecloud.com/v1.0/"; |
|
| 146 |
return loadBalancerORDUrl; |
|
| 147 |
} |
|
| 148 |
|
|
| 149 |
/** |
|
| 150 |
* @param loadBalancerORDUrl the loadBalancerORDUrl to set |
|
| 151 |
*/ |
|
| 152 |
public void setLoadBalancerORDUrl(String loadBalancerORDUrl) {
|
|
| 153 |
this.loadBalancerORDUrl = loadBalancerORDUrl; |
|
| 154 |
} |
|
| 155 |
|
|
| 156 |
/** |
|
| 157 |
* @return the loadBalancerUKUrl |
|
| 158 |
*/ |
|
| 159 |
public String getLoadBalancerUKUrl() {
|
|
| 160 |
loadBalancerUKUrl = "https://lon.loadbalancers.api.rackspacecloud.com/v1.0/"; |
|
| 161 |
return loadBalancerUKUrl; |
|
| 162 |
} |
|
| 163 |
|
|
| 164 |
/** |
|
| 165 |
* @param loadBalancerUKUrl the loadBalancerUKUrl to set |
|
| 166 |
*/ |
|
| 167 |
public void setLoadBalancerUKUrl(String loadBalancerUKUrl) {
|
|
| 168 |
this.loadBalancerUKUrl = loadBalancerUKUrl; |
|
| 169 |
} |
|
| 170 |
|
|
| 113 | 171 |
/** |
| 114 | 172 |
* @return the username |
| 115 | 173 |
*/ |
| b/src/com/rackspacecloud/android/ListAccountsActivity.java | ||
|---|---|---|
| 64 | 64 |
onRestoreInstanceState(savedInstanceState); |
| 65 | 65 |
registerForContextMenu(getListView()); |
| 66 | 66 |
context = getApplicationContext(); |
| 67 |
tabViewIntent = new Intent(this, TabViewActivity.class); |
|
| 67 |
// tabViewIntent = new Intent(this, TabViewActivity.class); |
|
| 68 |
tabViewIntent = new Intent(this, ActivityChooser.class); |
|
| 68 | 69 |
verifyPassword(); |
| 69 | 70 |
} |
| 70 | 71 |
|
Also available in: Unified diff