Revision f2020b69

b/AndroidManifest.xml
1 1 
<?xml version="1.0" encoding="utf-8"?>
2 2 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 
      package="com.rackspacecloud.android"
4 
      android:versionCode="1"
5 
      android:versionName="1.0">
6 
    <application android:icon="@drawable/rackspace60" android:label="@string/app_name">
7 
        <activity android:name=".RackspaceCloudActivity"
8 
                  android:label="@string/app_name">
9 
            <intent-filter>
10 
                <action android:name="android.intent.action.MAIN" />
11 
                <category android:name="android.intent.category.APPLICATION" />
12 
            </intent-filter>
13 
        </activity>
3 
	package="com.rackspacecloud.android" android:versionCode="1"
4 
	android:versionName="1.0">
5 
	<application android:icon="@drawable/rackspace60"
6 
		android:label="@string/app_name">
7 
		<activity android:name=".RackspaceCloudActivity"
8 
			android:label="@string/app_name">
9 
			<intent-filter>
10 
				<action android:name="android.intent.action.MAIN" />
11 
				<category android:name="android.intent.category.APPLICATION" />
12 
			</intent-filter>
13 
		</activity>
14 

  		





  
  15
  
    
		<activity android:name=".TabViewActivity" android:label="@string/app_name" android:configChanges="orientation">


  		





  
  16
  
    
			<intent-filter>


  		





  
  17
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  18
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  19
  
    
			</intent-filter>


  		





  
  20
  
    
		</activity>


  		





  
  21
  
    

  		





  
  22
  
    
		<activity android:name=".ListServersActivity" android:label="@string/app_name">


  		





  
  23
  
    
			<intent-filter>


  		





  
  24
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  25
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  26
  
    
			</intent-filter>


  		





  
  27
  
    
		</activity>


  		





  14
  28
  
    

  		





  15
  
  
    
        <activity android:name=".TabViewActivity" android:label="@string/app_name">


  		





  16
  
  
    
            <intent-filter>


  		





  17
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  18
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  19
  
  
    
            </intent-filter>


  		





  20
  
  
    
        </activity>


  		





  
  29
  
    
		<activity android:name=".AddServerActivity" android:label="@string/app_name">


  		





  
  30
  
    
			<intent-filter>


  		





  
  31
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  32
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  33
  
    
			</intent-filter>


  		





  
  34
  
    
		</activity>


  		





  
  35
  
    
		<activity android:name=".AddContainerActivity" android:label="@string/app_name">


  		





  
  36
  
    
			<intent-filter>


  		





  
  37
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  38
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  39
  
    
			</intent-filter>


  		





  
  40
  
    
		</activity>


  		





  21
  41
  
    

  		





  22
  
  
    
        <activity android:name=".ListServersActivity" android:label="@string/app_name">


  		





  23
  
  
    
            <intent-filter>


  		





  24
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  25
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  26
  
  
    
            </intent-filter>


  		





  27
  
  
    
        </activity>


  		





  
  42
  
    
		<activity android:name=".ViewServerActivity" android:label="@string/app_name">


  		





  
  43
  
    
			<intent-filter>


  		





  
  44
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  45
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  46
  
    
			</intent-filter>


  		





  
  47
  
    
		</activity>


  		





  
  48
  
    
		<activity android:name=".ViewServerActivity" android:label="@string/app_name">


  		





  
  49
  
    
			<intent-filter>


  		





  
  50
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  51
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  52
  
    
			</intent-filter>


  		





  
  53
  
    
		</activity>


  		





  
  54
  
    
		<activity android:name=".ContainerObjectsActivity"


  		





  
  55
  
    
			android:label="@string/app_name">


  		





  
  56
  
    
			<intent-filter>


  		





  
  57
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  58
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  59
  
    
			</intent-filter>


  		





  
  60
  
    
		</activity>


  		





  
  61
  
    
		<activity android:name=".ListContainerActivity"


  		





  
  62
  
    
			android:label="@string/app_name">


  		





  
  63
  
    
			<intent-filter>


  		





  
  64
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  65
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  66
  
    
			</intent-filter>


  		





  
  67
  
    
		</activity>


  		





  
  68
  
    
		<activity android:name=".ContainerObjectDetails"


  		





  
  69
  
    
			android:label="@string/app_name">


  		





  
  70
  
    
			<intent-filter>


  		





  
  71
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  72
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  73
  
    
			</intent-filter>


  		





  
  74
  
    
		</activity>


  		





  28
  75
  
    

  		





  29
  
  
    
        <activity android:name=".AddServerActivity" android:label="@string/app_name">


  		





  30
  
  
    
            <intent-filter>


  		





  31
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  32
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  33
  
  
    
            </intent-filter>


  		





  34
  
  
    
        </activity>


  		





  35
  
  
    
        <activity android:name=".AddContainerActivity" android:label="@string/app_name">


  		





  36
  
  
    
            <intent-filter>


  		





  37
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  38
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  39
  
  
    
            </intent-filter>


  		





  40
  
  
    
        </activity>


  		





  
  76
  
    
		<activity android:name=".EnableCDNActivity" android:label="@string/app_name">


  		





  
  77
  
    
			<intent-filter>


  		





  
  78
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  79
  
    
				<category android:name="android.intent.category.APPLICATION" />


  		





  
  80
  
    
			</intent-filter>


  		





  
  81
  
    
		</activity>


  		





  41
  82
  
    

  		





  42
  
  
    
        <activity android:name=".ViewServerActivity" android:label="@string/app_name">


  		





  43
  
  
    
            <intent-filter>


  		





  44
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  45
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  46
  
  
    
            </intent-filter>


  		





  47
  
  
    
        </activity>


  		





  48
  
  
    
 <activity android:name=".ViewServerActivity" android:label="@string/app_name">


  		





  49
  
  
    
            <intent-filter>


  		





  50
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  51
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  52
  
  
    
            </intent-filter>


  		





  53
  
  
    
        </activity>


  		





  54
  
  
    
         <activity android:name=".ContainerObjectsActivity" android:label="@string/app_name">


  		





  55
  
  
    
            <intent-filter>


  		





  56
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  57
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  58
  
  
    
            </intent-filter>


  		





  59
  
  
    
        </activity>


  		





  60
  
  
    
<activity android:name=".ListContainerActivity" android:label="@string/app_name">


  		





  61
  
  
    
            <intent-filter>


  		





  62
  
  
    
                <action android:name="android.intent.action.MAIN"/>


  		





  63
  
  
    
                <category android:name="android.intent.category.APPLICATION"/>


  		





  64
  
  
    
            </intent-filter>


  		





  65
  
  
    
        </activity>


  		





  66
  
  
    
        <activity android:name=".ContainerObjectDetails" android:label="@string/app_name">


  		





  67
  
  
    
        	<intent-filter>


  		





  68
  
  
    
        	 <action android:name="android.intent.action.MAIN"/>


  		





  69
  
  
    
        	 <category android:name="android.intent.category.APPLICATION"/>


  		





  70
  
  
    
        	</intent-filter>


  		





  71
  
  
    
        </activity>


  		





  72
  
  
    
                


  		





  73
  
  
    
        <activity android:name=".EnableCDNActivity" android:label="@string/app_name">


  		





  74
  
  
    
        	<intent-filter>


  		





  75
  
  
    
        	 <action android:name="android.intent.action.MAIN"/>


  		





  76
  
  
    
        	 <category android:name="android.intent.category.APPLICATION"/>


  		





  77
  
  
    
        	</intent-filter>


  		





  78
  
  
    
        </activity>


  		





  79
  
  
    
        


  		





  80
  
  
    
		<activity android:name=".Preferences" android:label="@string/preference_name"/>


  		





  
  83
  
    
		<activity android:name=".Preferences" android:label="@string/preference_name" />


  		





  81
  84
  
    
		<activity android:name="BackupServerActivity"></activity>


  		





  82
  85
  
    
		<activity android:name="PasswordServerActivity"></activity>


  		





  83
  86
  
    
		<activity android:name="PingServerActivity"></activity>


  		





  84
  
  
    
		<activity android:name="ListAccountsActivity">


  		





  
  87
  
    
		<activity android:name="ListAccountsActivity" android:configChanges="orientation">


  		





  85
  88
  
    
			<intent-filter>


  		





  86
  
  
    
        	 <action android:name="android.intent.action.MAIN"/>


  		





  87
  
  
    
        	 <category android:name="android.intent.category.LAUNCHER"/>


  		





  88
  
  
    
        	</intent-filter>


  		





  
  89
  
    
				<action android:name="android.intent.action.MAIN" />


  		





  
  90
  
    
				<category android:name="android.intent.category.LAUNCHER" />


  		





  
  91
  
    
			</intent-filter>


  		





  89
  92
  
    
		</activity>


  		





  90
  93
  
    
		<activity android:name="AddAccountActivity"></activity>


  		





  91
  94
  
    

  		





  92
  
  
    
    </application>


  		





  93
  
  
    
    <uses-sdk android:minSdkVersion="4" />


  		





  
  95
  
    
	</application>


  		





  
  96
  
    
	<uses-sdk android:minSdkVersion="4" />


  		





  94
  97
  
    

  		





  95
  
  
    
<uses-permission android:name="android.permission.INTERNET"></uses-permission>


  		





  
  98
  
    
	<uses-permission android:name="android.permission.INTERNET"></uses-permission>


  		





  96
  99
  
    
</manifest> 


  		












  

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






  19
  19
  
    

  		





  20
  20
  
    
import android.app.AlertDialog;


  		





  21
  21
  
    
import android.app.ListActivity;


  		





  
  22
  
    
import android.app.ProgressDialog;


  		





  22
  23
  
    
import android.content.Context;


  		





  23
  24
  
    
import android.content.DialogInterface;


  		





  24
  25
  
    
import android.content.Intent;


  		





  ......




  43
  44
  
    
	private final String FILENAME = "accounts.data";


  		





  44
  45
  
    
	private Intent tabViewIntent;


  		





  45
  46
  
    
	private boolean authenticating;


  		





  
  47
  
    
	ProgressDialog dialog;


  		





  46
  48
  
    

  		





  47
  49
  
    
	public void onCreate(Bundle savedInstanceState) {


  		





  48
  50
  
    
        super.onCreate(savedInstanceState);


  		





  ......




  64
  66
  
    
    		hideActivityIndicators();


  		





  65
  67
  
    
    	}


  		





  66
  68
  
    
		if (state != null && state.containsKey("accounts")) {


  		





  67
  
  
    
			Log.d("wowowowowo", "is this it???");


  		





  68
  69
  
    
    		accounts = readAccounts();


  		





  69
  70
  
    
    		if (accounts.size() == 0) {


  		





  70
  71
  
    
    			displayNoAccountsCell();


  		





  ......




  166
  167
  
    
			setActivityIndicatorsVisibility(View.VISIBLE, v);


  		





  167
  168
  
    
			accounts.remove(position);


  		





  168
  169
  
    
			loadAccounts();


  		





  169
  
  
    
		}


  		





  170
  
  
    
		//Intent viewIntent = new Intent(this, TabViewActivity.class);


  		





  171
  
  
    
	    //viewIntent.putExtra("server", servers[position]);


  		





  172
  
  
    
		//startActivityForResult(viewIntent, 57); // arbitrary number; never used again


  		





  173
  
  
    
    		


  		





  
  170
  
    
		}    		


  		





  174
  171
  
    
    }


  		





  175
  172
  
    
	


  		





  176
  173
  
    
	public void login() {


  		





  177
  174
  
    
        //showActivityIndicators();


  		





  178
  175
  
    
        //setLoginPreferences();


  		





  
  176
  
    
		dialog = ProgressDialog.show(ListAccountsActivity.this, "", "Authenticating...", true);


  		





  179
  177
  
    
        new AuthenticateTask().execute((Void[]) null);


  		





  180
  178
  
    
    }


  		





  181
  179
  
    
	


  		





  ......




  278
  276
  
    
    	


  		





  279
  277
  
    
		@Override


  		





  280
  278
  
    
		protected Boolean doInBackground(Void... arg0) {


  		





  281
  
  
    
			Log.d("auth", "task1");


  		





  
  279
  
    

  		





  282
  280
  
    
			authenticating = true;


  		





  283
  281
  
    
			return new Boolean(Authentication.authenticate());


  		





  284
  282
  
    
			//return true;


  		





  ......




  291
  289
  
    
				//startActivity(tabViewIntent);


  		





  292
  290
  
    
	        	new LoadImagesTask().execute((Void[]) null);				


  		





  293
  291
  
    
			} else {


  		





  
  292
  
    
				dialog.dismiss();


  		





  294
  293
  
    
				showAlert("Login Failure", "Authentication failed.  Please check your User Name and API Key.");


  		





  295
  294
  
    
			}


  		





  296
  295
  
    
		}


  		





  ......




  313
  312
  
    
					flavorMap.put(flavor.getId(), flavor);


  		





  314
  313
  
    
				}


  		





  315
  314
  
    
				Flavor.setFlavors(flavorMap);


  		





  
  315
  
    
				dialog.dismiss();


  		





  316
  316
  
    
				startActivity(tabViewIntent);


  		





  317
  317
  
    
			} else {


  		





  
  318
  
    
				dialog.dismiss();


  		





  318
  319
  
    
				showAlert("Login Failure", "There was a problem loading server flavors.  Please try again.");


  		





  319
  320
  
    
			}


  		





  320
  321
  
    
			hideActivityIndicators();


  		





  ......




  341
  342
  
    
				new LoadFlavorsTask().execute((Void[]) null);


  		





  342
  343
  
    
				//startActivity(tabViewIntent);


  		





  343
  344
  
    
			} else {


  		





  
  345
  
    
				dialog.dismiss();


  		





  344
  346
  
    
				showAlert("Login Failure", "There was a problem loading server images.  Please try again.");


  		





  345
  347
  
    
			}


  		





  346
  348
  
    
			hideActivityIndicators();


  		












Also available in:
  Unified diff