Filelisting using intents and OCFile.getId() instead of string matching

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDetailActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
index cb899f6..f5664ea 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
@@ -17,11 +17,13 @@
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r

+import android.content.Intent;\r

 import android.os.Bundle;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.os.Bundle;\r
 import android.support.v4.app.FragmentTransaction;\r

-import android.view.Window;\r

 \r
 \r

+import com.actionbarsherlock.app.ActionBar;\r

 import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r

+import com.actionbarsherlock.view.MenuItem;\r

 \r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;\r
 \r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;\r


@@ -38,11 +40,12 @@ public class FileDetailActivity extends SherlockFragmentActivity {
 \r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r
 \r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r

-        // TODO Auto-generated method stub\r

         super.onCreate(savedInstanceState);\r
         super.onCreate(savedInstanceState);\r

-        getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r

         setContentView(R.layout.file_activity_details);\r
 \r
         setContentView(R.layout.file_activity_details);\r
 \r

+        ActionBar actionBar = getSupportActionBar();\r
+        actionBar.setDisplayHomeAsUpEnabled(true);\r
+        \r

         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
         mFileDetail = new FileDetailFragment();\r
         ft.add(R.id.fragment, mFileDetail, "FileDetails");\r
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
         mFileDetail = new FileDetailFragment();\r
         ft.add(R.id.fragment, mFileDetail, "FileDetails");\r


@@ -51,6 +54,25 @@ public class FileDetailActivity extends SherlockFragmentActivity {
     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r

+    public boolean onOptionsItemSelected(MenuItem item) {\r
+        boolean returnValue = false;\r
+        \r
+        switch(item.getItemId()){\r
+        case android.R.id.home:\r
+            Intent intent = new Intent(this, FileDisplayActivity.class);\r
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
+            intent.putExtra(FileDetailFragment.EXTRA_FILE, mFileDetail.getDisplayedFile());\r
+            startActivity(intent);\r
+            finish();\r
+            returnValue = true;\r
+        }\r
+        \r
+        return returnValue;\r
+    }\r
+\r
+\r
+\r
+    @Override\r

     protected void onResume() {\r
         super.onResume();\r
         mFileDetail.updateFileDetails(getIntent());\r
     protected void onResume() {\r
         super.onResume();\r
         mFileDetail.updateFileDetails(getIntent());\r