From: Lennart Rosam <lennart@familie-rosam.de>
Date: Sun, 15 Apr 2012 10:41:36 +0000 (+0200)
Subject: Merge branch 'fragments-ui' of
X-Git-Tag: oc-android-1.4.3~443
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/51302a638677b16c5faac6242da44080794f537e?ds=inline;hp=-c

Merge branch 'fragments-ui' of
ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
	src/eu/alefzero/owncloud/datamodel/OCFile.java
---

51302a638677b16c5faac6242da44080794f537e
diff --combined src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 10a8671e,5bf71466..5ae763cc
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@@ -45,6 -45,8 +45,8 @@@ import com.actionbarsherlock.view.MenuI
  import eu.alefzero.owncloud.R;
  import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
  import eu.alefzero.owncloud.authenticator.AuthUtils;
+ import eu.alefzero.owncloud.datamodel.DataStorageManager;
+ import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
  import eu.alefzero.owncloud.datamodel.OCFile;
  import eu.alefzero.owncloud.ui.fragment.FileListFragment;
  import eu.alefzero.webdav.WebdavClient;
@@@ -59,6 -61,7 +61,7 @@@
  public class FileDisplayActivity extends SherlockFragmentActivity implements
  		OnNavigationListener {
  	private ArrayAdapter<String> mDirectories;
+ 	private DataStorageManager mStorageManager;
  
  	private static final int DIALOG_CHOOSE_ACCOUNT = 0;
  
@@@ -92,12 -95,15 +95,15 @@@
  				for (int i = mDirectories.getCount() - 2; i >= 0; --i) {
  					path += "/" + mDirectories.getItem(i);
  				}
- 				OCFile parent = new OCFile(getContentResolver(), a, path + "/");
- 				path += "/" + s + "/";
+ 				OCFile parent = mStorageManager.getFileByPath(path + "/");
+ 				path += s + "/";
  				Thread thread = new Thread(new DirectoryCreator(path, a));
  				thread.start();
- 				OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0,
- 						"DIR", parent.getFileId()).save();
+ 				
+ 				OCFile new_file = new OCFile(path);
+ 				new_file.setMimetype("DIR");
+ 				new_file.setParentId(parent.getParentId());
+ 				mStorageManager.saveFile(new_file);
  
  				dialog.dismiss();
  			}
@@@ -118,6 -124,7 +124,7 @@@
  				R.layout.sherlock_spinner_dropdown_item);
  		mDirectories.add("/");
  		setContentView(R.layout.files);
+ 		mStorageManager = new FileDataStorageManager(AuthUtils.getCurrentOwnCloudAccount(this), getContentResolver());
  		ActionBar action_bar = getSupportActionBar();
  		action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
  		action_bar.setDisplayShowTitleEnabled(false);
@@@ -138,7 -145,7 +145,7 @@@
  			break;
  		}
  		case android.R.id.home: {
 -			navigateUp();
 +			onBackPressed();
  			break;
  		}
  			
@@@ -146,11 -153,11 +153,11 @@@
  		return true;
  	}
  	
 -	public void navigateUp(){
 +	@Override
 +	public void onBackPressed(){
  		popPath();
  		if(mDirectories.getCount() == 0) {
  			Intent intent = new Intent(this, LandingActivity.class);
 -			intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
  			startActivity(intent);
  			return;
  		}
@@@ -208,7 -215,7 +215,7 @@@
  	public boolean onNavigationItemSelected(int itemPosition, long itemId) {
  		int i = itemPosition;
  		while (i-- != 0) {
 -			navigateUp();
 +			onBackPressed();
  		}
  		return true;
  	}
@@@ -272,4 -279,4 +279,4 @@@
  
  		
  	}
--}
++}