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

Revision c16dc9e7

     		this.context = context;
+    	}
     	public ArrayList<ContainerObjects> createList(boolean detail, String passName) throws CloudServersException {
     	public ArrayList<ContainerObjects> createList(boolean detail, String passName, String path) throws CloudServersException {
     		CustomHttpClient httpclient = new CustomHttpClient(context);
     		HttpGet get = new HttpGet(Account.getAccount().getStorageUrl()+"/"+passName+"?format=xml");
     		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");
     		ArrayList<ContainerObjects> files = new ArrayList<ContainerObjects>();

     	public int bConver = 1048576;
     	public int kbConver = 1024;
     	private Context context;
     	private String currentPath;
     	@Override
     	public void onCreate(Bundle savedInstanceState) {
-...
     		} else {
     			cdnEnabledIs = "false";
+    		}
     		getPath();
     		restoreState(savedInstanceState);
+    	}
     	@Override
     	protected void onSaveInstanceState(Bundle outState) {
     		super.onSaveInstanceState(outState);
     		outState.putSerializable("container", files);
     		outState.putString("path", currentPath);
+    	}
     	private void restoreState(Bundle state) {
-...
     			} else {
     				getListView().setDividerHeight(1); // restore divider lines
     				setListAdapter(new FileAdapter());
+    			}
     		} else {
+    		}
     		else {
     			loadFiles();
+    		}
+    	}
     	protected void onListItemClick(ListView l, View v, int position, long id) {
     		if (files != null && files.length > 0) {
     			Intent viewIntent = new Intent(this, ContainerObjectDetails.class);
     			viewIntent.putExtra("container", files[position]);
     			viewIntent.putExtra("cdnUrl", container.getCdnUrl());
     			viewIntent.putExtra("containerNames", container.getName());
     			viewIntent.putExtra("isCdnEnabled", cdnEnabledIs);
     			startActivityForResult(viewIntent, 55); // arbitrary number; never
     													// used again
     			Intent viewIntent;
     			if(files[position].getContentType().equals("application/directory")){
     				viewIntent = new Intent(this, ContainerObjectsActivity.class);
     				viewIntent.putExtra("container", container);
     				viewIntent.putExtra("cdnUrl", container.getCdnUrl());
     				viewIntent.putExtra("containerNames", container.getName());
     				viewIntent.putExtra("isCdnEnabled", cdnEnabledIs);
     				viewIntent.putExtra("path", files[position].getCName());
     				Log.d("the path name is: ","captin " + files[position].getCName());
     				startActivity(viewIntent);
+    			}
     			else{
     				viewIntent = new Intent(this, ContainerObjectDetails.class);
     				viewIntent.putExtra("container", files[position]);
     				viewIntent.putExtra("cdnUrl", container.getCdnUrl());
     				viewIntent.putExtra("containerNames", container.getName());
     				viewIntent.putExtra("isCdnEnabled", cdnEnabledIs);
     				startActivityForResult(viewIntent, 55); // arbitrary number; never
     				// used again
+    			}
+    		}
+    	}
     	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((Void[]) null);
     		new LoadFilesTask().execute(currentPath);
+    	}
-...
+    	}
     	private class LoadFilesTask extends
     			AsyncTask<Void, Void, ArrayList<ContainerObjects>> {
     			AsyncTask<String, Void, ArrayList<ContainerObjects>> {
     		private CloudServersException exception;
     		@Override
     		protected ArrayList<ContainerObjects> doInBackground(Void... arg0) {
     		protected ArrayList<ContainerObjects> doInBackground(String... path) {
     			ArrayList<ContainerObjects> files = null;
     			try {
     				files = (new ContainerObjectManager(context)).createList(true,
     						container.getName());
     						container.getName(), path[0]);
     			} catch (CloudServersException e) {
     				exception = e;
     				e.printStackTrace();
-...
     					parent, false);
     			TextView label = (TextView) row.findViewById(R.id.label);
     			label.setText(file.getCName());
     			//label.setText(file.getCName());
     			label.setText(getShortName(file.getCName()));
     			if (file.getBytes() >= bConver) {
     				megaBytes = Math.abs(file.getBytes() / bConver + 0.2);
-...
     			return (row);
+    		}
+    	}
     	/* just get the last part of the filename
     	 * so the entire file path does not show
     	*/
     	private String getShortName(String longName){
     		String s = longName;
     		if(!s.contains("/")){
     			return s;
+    		}
     		else {
     			return s.substring(s.lastIndexOf('/')+1);
+    		}
+    	}
     	// Create the Menu options
     	@Override

Also available in: Unified diff

Synnefo » Pithos Android Client

Revision c16dc9e7