Revision 877f6f58

b/src/com/rackspacecloud/android/ContainerObjectDetails.java
220 220

  
221 221
		//Last Modification date
222 222
		String strDate = objects.getLastMod();
223
		strDate = strDate.substring(0, strDate.indexOf('T'));
224
		/*
223 225
		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.ssssss");
224 226
		Date dateStr = null;
225 227
		try {
......
228 230
			e1.printStackTrace();
229 231
		}
230 232
		String formattedDate = formatter.format(dateStr);
233

  
231 234
		Date date1 = null;
232 235
		try {
233 236
			date1 = formatter.parse(formattedDate);
......
236 239
		}      
237 240
		formatter = new SimpleDateFormat("MMM-dd-yyyy");
238 241
		formattedDate = formatter.format(date1);
242
		*/
239 243
		TextView lastmod = (TextView) findViewById(R.id.view_file_modification);
240
		lastmod.setText(formattedDate);    	  
244
		lastmod.setText(strDate);    	  
241 245

  
242 246
	}
243 247

  
b/src/com/rackspacecloud/android/ContainerObjectsActivity.java
173 173
			deleteObjTask = new DeleteObjectListenerTask();
174 174
			deleteObjTask.execute();
175 175
		}
176
		
177
		if(app.isDeletingContainer()){
178
			displayNoFilesCell();
179
			deleteContainerTask = new DeleteContainerListenerTask();
180
			deleteContainerTask.execute();
181
		}
176 182

  
177 183

  
178 184
	}
......
243 249
		new LoadFilesTask().execute();
244 250
	}
245 251

  
246
	/*
247
	private void displayLoadingCell() {
248
		String a[] = new String[1];
249
		a[0] = "Loading...";
250
		setListAdapter(new ArrayAdapter<String>(this, R.layout.loadingcell,
251
				R.id.loading_label, a));
252
		getListView().setTextFilterEnabled(true);
253
		getListView().setDividerHeight(0); // hide the dividers so it won't look
254
											// like a list row
255
		getListView().setItemsCanFocus(false);
256
	}
257
	 */
258 252

  
259 253
	/* load only the files that should display for the 
260 254
	 * current directory in the curDirFiles[]
......
318 312
			for(int i = 0; i < app.getCurFiles().size(); i++){
319 313
				tempList.add(app.getCurFiles().get(i));
320 314
			}
321
			/*
322
			adapter.clear();
323
			for(int i = 0; i < tempList.size(); i++){
324
				adapter.add(tempList.get(i));
325
				Log.d("info", "the count is: " + adapter.getCount());
326
			}
327
			*/
328 315
			getListView().setDividerHeight(1); // restore divider lines
329 316
			setListAdapter(new FileAdapter());
330 317
		}
......
956 943
		 */
957 944
		@Override
958 945
		protected void onPostExecute(Void arg1) {
946

  
947
			hideDialog();
959 948
			setResult(RESULT_OK);
960 949
			finish();
961 950
		}
b/src/com/rackspacecloud/android/ListContainerActivity.java
59 59
	}
60 60

  
61 61
	private void restoreState(Bundle state) {
62
		if (state != null && state.containsKey("container") && state.getSerializable("container") != null) {
62
		if(state != null && state.containsKey("loading") && state.getBoolean("loading")){
63
			loadContainers();
64
			registerForContextMenu(getListView());
65
		}
66
		else if (state != null && state.containsKey("container") && state.getSerializable("container") != null) {
63 67
			containers = (Container[]) state.getSerializable("container");
64 68
			if (containers.length == 0) {
65 69
				displayNoServersCell();

Also available in: Unified diff