Revision f3633a16 src/com/rackspacecloud/android/ListAccountsActivity.java
b/src/com/rackspacecloud/android/ListAccountsActivity.java | ||
---|---|---|
15 | 15 |
import com.rackspace.cloud.loadbalancer.api.client.Protocol; |
16 | 16 |
import com.rackspace.cloud.loadbalancer.api.client.ProtocolManager; |
17 | 17 |
import com.rackspace.cloud.servers.api.client.Account; |
18 |
import com.rackspace.cloud.servers.api.client.CloudServersException; |
|
18 | 19 |
import com.rackspace.cloud.servers.api.client.Flavor; |
19 | 20 |
import com.rackspace.cloud.servers.api.client.FlavorManager; |
20 | 21 |
import com.rackspace.cloud.servers.api.client.Image; |
... | ... | |
217 | 218 |
if (accounts != null && accounts.size() > 0) { |
218 | 219 |
//setActivityIndicatorsVisibility(View.VISIBLE, v); |
219 | 220 |
Account.setAccount(accounts.get(position)); |
221 |
Log.d("info", "the server is " + Account.getAccount().getAuthServerV2()); |
|
220 | 222 |
login(); |
221 | 223 |
} |
222 | 224 |
} |
... | ... | |
297 | 299 |
|
298 | 300 |
public String getAccountServer(Account account){ |
299 | 301 |
String authServer = account.getAuthServer(); |
302 |
if(authServer == null){ |
|
303 |
authServer = account.getAuthServerV2(); |
|
304 |
} |
|
300 | 305 |
String result; |
301 |
if(authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER)){ |
|
306 |
|
|
307 |
if(authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER) || authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER_V2)){ |
|
302 | 308 |
result = "Rackspace Cloud (UK)"; |
303 | 309 |
} |
304 |
else if(authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER)){ |
|
310 |
else if(authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER) || authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER_V2)){
|
|
305 | 311 |
result = "Rackspace Cloud (US)"; |
306 | 312 |
} |
307 | 313 |
else{ |
... | ... | |
313 | 319 |
|
314 | 320 |
//display rackspace logo for cloud accounts and openstack logo for others |
315 | 321 |
private int setAccountIcon(Account account){ |
316 |
if(account.getAuthServer().equals(Preferences.COUNTRY_UK_AUTH_SERVER) |
|
317 |
|| account.getAuthServer().equals(Preferences.COUNTRY_US_AUTH_SERVER)){ |
|
322 |
String authServer = account.getAuthServer(); |
|
323 |
if(authServer == null){ |
|
324 |
authServer = account.getAuthServerV2(); |
|
325 |
} |
|
326 |
if(authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER) |
|
327 |
|| authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER) |
|
328 |
|| authServer.equals(Preferences.COUNTRY_US_AUTH_SERVER_V2) |
|
329 |
|| authServer.equals(Preferences.COUNTRY_UK_AUTH_SERVER_V2)){ |
|
318 | 330 |
return R.drawable.rackspacecloud_icon; |
319 | 331 |
} |
320 | 332 |
else{ |
... | ... | |
332 | 344 |
if (resultCode == RESULT_OK && requestCode == 78) { |
333 | 345 |
Account acc = new Account(); |
334 | 346 |
Bundle b = data.getBundleExtra("accountInfo"); |
335 |
acc.setApiKey(b.getString("apiKey"));
|
|
347 |
acc.setPassword(b.getString("apiKey"));
|
|
336 | 348 |
acc.setUsername(b.getString("username")); |
337 |
acc.setAuthServer(b.getString("server")); |
|
349 |
acc.setAuthServerV2(b.getString("server")); |
|
350 |
Log.d("info", "the set server was " + b.getString("server")); |
|
351 |
Log.d("info", "the server is " + acc.getAuthServerV2()); |
|
338 | 352 |
accounts.add(acc); |
339 | 353 |
writeAccounts(); |
340 | 354 |
loadAccounts(); |
... | ... | |
383 | 397 |
|
384 | 398 |
@Override |
385 | 399 |
protected Boolean doInBackground(Void... arg0) { |
386 |
return new Boolean(Authentication.authenticate(context)); |
|
400 |
try { |
|
401 |
return new Boolean(Authentication.authenticate(context)); |
|
402 |
} catch (CloudServersException e) { |
|
403 |
e.printStackTrace(); |
|
404 |
return false; |
|
405 |
} |
|
387 | 406 |
} |
388 | 407 |
|
389 | 408 |
@Override |
Also available in: Unified diff