/ - Diff - Pithos Android Client - Greek Research and Technology Network's projects

Revision 37a14877

     <?xml version="1.0" encoding="utf-8"?>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="264dip"
+        >
         <TextView android:id="@+id/no_files_label"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="125px"
             android:textColor="#FFFFFF"
             android:gravity="center"
             android:textSize="24sp" android:text="No Files "/>
         <TextView android:id="@+id/no_files_sublabel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10px"
             android:textColor="#FFFFFF"
             android:gravity="center"
             android:textSize="12sp" android:text="Press menu to delete an empty folder"/>
     </LinearLayout>

             android:layout_height="wrap_content"
             android:layout_marginTop="125px"
             android:textColor="#FFFFFF"
             android:text="No Files In Current Container"
             android:gravity="center"
             android:textSize="24sp" />
             android:textSize="24sp" android:text="No Files "/>
         <TextView android:id="@+id/no_files_sublabel"
             android:layout_width="fill_parent"

     <?xml version="1.0" encoding="utf-8"?>
     <menu xmlns:android="http://schemas.android.com/apk/res/android">
        <item android:id="@+id/delete_container" android:title="Delete Container" android:icon="@drawable/add_button" />
        <item android:icon="@drawable/add_button" android:title="Delete" android:id="@+id/delete_container"/>
        <item android:id="@+id/enable_cdn" android:title="Enable CDN" android:icon="@drawable/add_button" />
        <item android:id="@+id/refresh" android:title="Refresh" android:icon="@drawable/refresh_button" />
        <item android:title="Add Folder" android:id="@+id/add_folder" android:icon="@drawable/add_button"></item>
        <item android:title="Add File" android:id="@+id/add_file" android:icon="@drawable/add_button"></item>
     </menu>

     import org.xml.sax.XMLReader;
     import android.content.Context;
     import android.util.Log;
     import com.rackspace.cloud.files.api.client.parsers.ContainerObjectXMLparser;
     import com.rackspace.cloud.servers.api.client.Account;
-...
     		this.context = context;
+    	}
     	public ArrayList<ContainerObjects> createList(boolean detail, String passName, String path) throws CloudServersException {
     	public ArrayList<ContainerObjects> createList(boolean detail, String passName) throws CloudServersException {
     		CustomHttpClient httpclient = new CustomHttpClient(context);
     		Log.d("Request", "captin the request is : " + Account.getAccount().getStorageUrl()+"/"+passName+"?path=" + path + "&format=xml");
     		HttpGet get = new HttpGet(Account.getAccount().getStorageUrl()+"/"+passName+"?path=" + path + "&format=xml");
     		HttpGet get = new HttpGet(Account.getAccount().getStorageUrl()+"/"+passName + "?format=xml");
     		ArrayList<ContainerObjects> files = new ArrayList<ContainerObjects>();
-...
     		HttpResponse resp = null;
     		CustomHttpClient httpclient = new CustomHttpClient(context);
     		HttpDelete deleteObject = new HttpDelete(Account.getAccount().getStorageUrl() + "/" + Container + "/" + Object);
     		Log.v(LOG, "the container (deleteObject) vairble "+Container+" "+Object);
     		deleteObject.addHeader("X-Auth-Token", Account.getAccount().getAuthToken());
     		httpclient.removeRequestInterceptorByClass(RequestExpectContinue.class);

     public class ContainerObjectsActivity extends ListActivity {
     	private static final int deleteContainer = 0;
     	private static final int deleteFolder = 1;
     	private ContainerObjects[] files;
     	private static Container container;
     	public String LOG = "viewFilesActivity";
-...
     	public int kbConver = 1024;
     	private Context context;
     	private String currentPath;
     	private ContainerObjects[] curDirFiles;
     	@Override
     	public void onCreate(Bundle savedInstanceState) {
-...
     		} else {
     			cdnEnabledIs = "false";
+    		}
     		getPath();
     		restoreState(savedInstanceState);
+    	}
-...
+    	}
     	private void restoreState(Bundle state) {
     		getPath();
     		if (state != null && state.containsKey("container")) {
     			files = (ContainerObjects[]) state.getSerializable("container");
     			if (files.length == 0) {
-...
+    	}
     	protected void onListItemClick(ListView l, View v, int position, long id) {
     		if (files != null && files.length > 0) {
     		if (curDirFiles != null && curDirFiles.length > 0) {
     			Intent viewIntent;
     			if(files[position].getContentType().equals("application/directory")){
     			if(curDirFiles[position].getContentType().equals("application/directory")){
     				/*
     				viewIntent = new Intent(this, ContainerObjectsActivity.class);
     				viewIntent.putExtra("container", container);
     				viewIntent.putExtra("cdnUrl", container.getCdnUrl());
-...
     				viewIntent.putExtra("isCdnEnabled", cdnEnabledIs);
     				viewIntent.putExtra("path", files[position].getCName());
     				Log.d("the path name is: ","captin " + files[position].getCName());
     				startActivity(viewIntent);
     				startActivityForResult(viewIntent, 56);
     				*/
     				currentPath = curDirFiles[position].getCName() + "/";
     				loadCurrentDirectoryFiles();
     				displayCurrentFiles();
+    			}
     			else{
     				viewIntent = new Intent(this, ContainerObjectDetails.class);
     				viewIntent.putExtra("container", files[position]);
-...
+    			}
+    		}
+    	}
     	/*
     	 * overriding back button press, because we are not actually changing
     	 * activites when we navigate the file structure
     	 */
     	public void onBackPressed() {
     		if(currentPath.equals("")){
     			finish();
+    		}
     		else{
     			goUpDirectory();
+    		}
+    	}
     	/*
     	 * go to the current directory's parent and display that data
     	 */
     	private void goUpDirectory(){
     		currentPath = currentPath.substring(0, currentPath.substring(0, currentPath.length()-2).lastIndexOf("/")+1);
     		loadCurrentDirectoryFiles();
     		displayCurrentFiles();
+    	}
     	/*
     	 * get the path that was stored in the intent
     	 */
     	private void getPath(){
     		if(this.getIntent().getExtras().containsKey("path")){
     			Log.d("contained path", "captin: " +  (String)this.getIntent().getExtras().get("path"));
     			currentPath = (String)this.getIntent().getExtras().get("path");
+    		}
     		else{
     			Log.d("contained path", "captin no path");
     			currentPath = "";
+    		}
-...
     	private void loadFiles() {
     		displayLoadingCell();
     		new LoadFilesTask().execute(currentPath);
     		new LoadFilesTask().execute();
+    	}
     	/* load only the files that should display for the
     	 * current directory in the curDirFiles[]
     	 */
     	private void loadCurrentDirectoryFiles(){
     		ArrayList<ContainerObjects> curFiles = new ArrayList<ContainerObjects>();
     		if(files != null){
     			for(int i = 0 ; i < files.length; i ++){
     				if(fileBelongsInDir(files[i])){
     					curFiles.add(files[i]);
+    				}
+    			}
     			curDirFiles = new ContainerObjects[curFiles.size()];
     			for(int i = 0; i < curFiles.size(); i++){
     				curDirFiles[i] = curFiles.get(i);
+    			}
+    		}
+    	}
     	/*
     	 * determines if a file should be displayed in current
     	 * directory
     	 */
     	private Boolean fileBelongsInDir(ContainerObjects obj){
     		String objPath = obj.getCName();
     		if(!objPath.startsWith(currentPath)){
     			return false;
+    		}
     		else{
     			objPath = objPath.substring(currentPath.length());
     			return !objPath.contains("/");
+    		}
+    	}
     	/*
     	 * loads all the files that are in the container
     	 * into one array
     	 */
     	private void setFileList(ArrayList<ContainerObjects> files) {
     		if (files == null) {
     			files = new ArrayList<ContainerObjects>();
-...
+    			}
+    		}
     		if (fileNames.length == 0) {
     		displayCurrentFiles();
+    	}
     	private void displayCurrentFiles(){
     		loadCurrentDirectoryFiles();
     		if (curDirFiles.length == 0) {
     			displayNoServersCell();
     		} else {
     			getListView().setDividerHeight(1); // restore divider lines
-...
     		getListView().setItemsCanFocus(false);
+    	}
     	/*
     	 * display a different empty page depending
     	 * of if you are at top of container or
     	 * in a folder
     	 */
     	private void displayNoServersCell() {
     		String a[] = new String[1];
     		a[0] = "No Files";
     		setListAdapter(new ArrayAdapter<String>(this, R.layout.noobjectscell,
     		if(currentPath.equals("")){
     			a[0] = "Empty Container";
     			setListAdapter(new ArrayAdapter<String>(this, R.layout.noobjectscell,
     				R.id.no_files_label, a));
+    		}
     		else{
     			a[0] = "No Files";
     			setListAdapter(new ArrayAdapter<String>(this, R.layout.nofilescell,
     						R.id.no_files_label, a));
+    		}
     		getListView().setTextFilterEnabled(true);
     		getListView().setDividerHeight(0); // hide the dividers so it won't look
     											// like a list row
-...
     			ArrayList<ContainerObjects> files = null;
     			try {
     				files = (new ContainerObjectManager(context)).createList(true,
     						container.getName(), path[0]);
     						container.getName());
     			} catch (CloudServersException e) {
     				exception = e;
     				e.printStackTrace();
-...
     	class FileAdapter extends ArrayAdapter<ContainerObjects> {
     		FileAdapter() {
     			super(ContainerObjectsActivity.this,
     					R.layout.listcontainerobjectcell, files);
     					R.layout.listcontainerobjectcell, curDirFiles);
+    		}
     		public View getView(int position, View convertView, ViewGroup parent) {
     			ContainerObjects file = files[position];
     			ContainerObjects file = curDirFiles[position];
     			LayoutInflater inflater = getLayoutInflater();
     			View row = inflater.inflate(R.layout.listcontainerobjectcell,
     					parent, false);
     			TextView label = (TextView) row.findViewById(R.id.label);
     			//label.setText(file.getCName());
     			label.setText(getShortName(file.getCName()));
     			label.setText(file.getCName());
     			if (file.getBytes() >= bConver) {
     				megaBytes = Math.abs(file.getBytes() / bConver + 0.2);
-...
     			return s;
+    		}
     		else {
     			return s.substring(s.lastIndexOf('/')+1);
     			return s.substring(s.lastIndexOf('/'));
+    		}
+    	}
     	// Create the Menu options
     	/*
     	 * Create the Menu options
     	 */
     	@Override
     	public boolean onCreateOptionsMenu(Menu menu) {
     		super.onCreateOptionsMenu(menu);
-...
+    	}
     	@Override
     	/*
     	 * option performed for delete depends on if you
     	 * are at the top of a container or in a folder
     	 */
     	public boolean onOptionsItemSelected(MenuItem item) {
     		switch (item.getItemId()) {
     		case R.id.delete_container:
     			showDialog(deleteContainer);
     			if(currentPath.equals("")){
     				Log.d("deleting", "captin deleting a container");
     				showDialog(deleteContainer);
+    			}
     			else{
     				Log.d("deleting", "captin deleting a folder");
     				showDialog(deleteFolder);
+    			}
     			return true;
     		case R.id.enable_cdn:
     			Intent viewIntent1 = new Intent(this, EnableCDNActivity.class);
-...
     	protected Dialog onCreateDialog(int id) {
     		switch (id) {
     		case deleteContainer:
     			return new AlertDialog.Builder(ContainerObjectsActivity.this)
     					.setIcon(R.drawable.alert_dialog_icon)
     					.setTitle("Delete Container")
     					.setMessage(
     							"Are you sure you want to delete this Container?")
     					.setPositiveButton("Delete Container",
     							new DialogInterface.OnClickListener() {
     								public void onClick(DialogInterface dialog,
     										int whichButton) {
     									// User clicked OK so do some stuff
     									new DeleteContainerTask()
     											.execute((Void[]) null);
+    								}
     							})
     					.setNegativeButton("Cancel",
     							new DialogInterface.OnClickListener() {
     								public void onClick(DialogInterface dialog,
     										int whichButton) {
     									// User clicked Cancel so do some stuff
+    								}
     							}).create();
     			if(curDirFiles.length == 0){
     				return new AlertDialog.Builder(ContainerObjectsActivity.this)
     				.setIcon(R.drawable.alert_dialog_icon)
     				.setTitle("Delete Container")
     				.setMessage(
     				"Are you sure you want to delete this Container?")
     				.setPositiveButton("Delete Container",
     						new DialogInterface.OnClickListener() {
     					public void onClick(DialogInterface dialog,
     							int whichButton) {
     						// User clicked OK so do some stuff
     						new DeleteContainerTask()
     						.execute(currentPath);
+    					}
     				})
     				.setNegativeButton("Cancel",
     						new DialogInterface.OnClickListener() {
     					public void onClick(DialogInterface dialog,
     							int whichButton) {
     						// User clicked Cancel so do some stuff
+    					}
     				}).create();
+    			}
     			else{
     				return new AlertDialog.Builder(ContainerObjectsActivity.this)
     				.setIcon(R.drawable.alert_dialog_icon)
     				.setTitle("Delete Container")
     				.setMessage("Container must be empty to delete")
     				.setNegativeButton("OK",
     						new DialogInterface.OnClickListener() {
     					public void onClick(DialogInterface dialog,
     							int whichButton) {
     						// User clicked Cancel so do some stuff
+    					}
     				}).create();
+    			}
     		case deleteFolder:
     			if(curDirFiles.length == 0){
     				return new AlertDialog.Builder(ContainerObjectsActivity.this)
     				.setIcon(R.drawable.alert_dialog_icon)
     				.setTitle("Delete Folder")
     				.setMessage(
     				"Are you sure you want to delete this Folder?")
     				.setPositiveButton("Delete Folder",
     						new DialogInterface.OnClickListener() {
     					public void onClick(DialogInterface dialog,
     							int whichButton) {
     						// User clicked OK so do some stuff
     						new DeleteObjectTask()
     						.execute();
+    					}
     				})
     				.setNegativeButton("Cancel",
     						new DialogInterface.OnClickListener() {
     					public void onClick(DialogInterface dialog,
     							int whichButton) {
     						// User clicked Cancel so do some stuff
+    					}
     				}).create();
+    			}
     			else{
     				return new AlertDialog.Builder(ContainerObjectsActivity.this)
     				.setIcon(R.drawable.alert_dialog_icon)
     				.setTitle("Delete Folder")
     				.setMessage(
     				"Folder must be empty to delete")
     				.setNegativeButton("OK",
     						new DialogInterface.OnClickListener() {
     					public void onClick(DialogInterface dialog,
     							int whichButton) {
     						// User clicked Cancel so do some stuff
+    					}
     				}).create();
+    			}
+    		}
     		return null;
-...
     		return cse;
+    	}
     	private class DeleteContainerTask extends
     			AsyncTask<Void, Void, HttpResponse> {
     	private class DeleteObjectTask extends
     	AsyncTask<Void, Void, HttpResponse> {
     		private CloudServersException exception;
-...
     		protected HttpResponse doInBackground(Void... arg0) {
     			HttpResponse resp = null;
     			try {
     				//subtring because the current directory contains a "/" at the end of the string
     				resp = (new ContainerObjectManager(context)).deleteObject(container.getName(), currentPath.substring(0, currentPath.length()-1));
     			} catch (CloudServersException e) {
     				exception = e;
+    			}
     			return resp;
+    		}
     		@Override
     		protected void onPostExecute(HttpResponse response) {
     			if (response != null) {
     				int statusCode = response.getStatusLine().getStatusCode();
     				if (statusCode == 409) {
     					showAlert("Error",
     					"Folder must be empty in order to delete");
+    				}
     				if (statusCode == 204) {
     					setResult(Activity.RESULT_OK);
     					goUpDirectory();
     					loadFiles();
     				} else {
     					CloudServersException cse = parseCloudServersException(response);
     					if ("".equals(cse.getMessage())) {
     						showAlert("Error",
     							"There was a problem deleting your folder.");
     					} else {
     						showAlert("Error",
     								"There was a problem deleting your folder: "
     									+ cse.getMessage());
+    					}
+    				}
     			} else if (exception != null) {
     				showAlert("Error", "There was a problem deleting your folder: "
     						+ exception.getMessage());
+    			}
+    		}
+    	}
     	private class DeleteContainerTask extends
     	AsyncTask<String, Void, HttpResponse> {
     		private CloudServersException exception;
     		@Override
     		protected HttpResponse doInBackground(String... object) {
     			HttpResponse resp = null;
     			try {
     				resp = (new ContainerManager(context)).delete(container.getName());
     				Log.v(LOG, "container's name " + container.getName());
     			} catch (CloudServersException e) {
-...
     				int statusCode = response.getStatusLine().getStatusCode();
     				if (statusCode == 409) {
     					showAlert("Error",
     							"Container must be empty in order to delete");
     					"Container must be empty in order to delete");
+    				}
     				if (statusCode == 204) {
     					setResult(Activity.RESULT_OK);
     					loadFiles();
     					finish();
     				} else {
     					CloudServersException cse = parseCloudServersException(response);
     					if ("".equals(cse.getMessage())) {
     						showAlert("Error",
     								"There was a problem deleting your container.");
     							"There was a problem deleting your container.");
     					} else {
     						showAlert("Error",
     								"There was a problem deleting your container: "
     										+ cse.getMessage());
     									+ cse.getMessage());
+    					}
+    				}
     			} else if (exception != null) {

Also available in: Unified diff

Synnefo » Pithos Android Client

Revision 37a14877