Merge pull request #324 from owncloud/last_minute_release-1.5.2

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java
index 9cd1b9c..b6c6574 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileFragment.java
@@ -2,9 +2,8 @@
  *   Copyright (C) 2012-2013  ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   Copyright (C) 2012-2013  ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify

- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.

  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -18,34 +17,63 @@
 
 package com.owncloud.android.ui.fragment;
 
 
 package com.owncloud.android.ui.fragment;
 

-import android.content.Intent;

 import android.support.v4.app.Fragment;
 
 import android.support.v4.app.Fragment;
 

+import com.actionbarsherlock.app.SherlockFragment;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCFile;

+import com.owncloud.android.files.FileHandler;

 import com.owncloud.android.ui.activity.TransferServiceGetter;
 
 import com.owncloud.android.ui.activity.TransferServiceGetter;
 

+

 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
  * 
  * @author David A. Velasco
  *
  */
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
  * 
  * @author David A. Velasco
  *
  */

-public interface FileFragment {
+public class FileFragment extends SherlockFragment {

     
     

+    private OCFile mFile;
+
+
+    /**
+     * Creates an empty fragment.
+     * 
+     * It's necessary to keep a public constructor without parameters; the system uses it when tries to reinstantiate a fragment automatically. 
+     */
+    public FileFragment() {
+        mFile = null;
+    }
+    
+    /**
+     * Creates an instance for a given {@OCFile}.
+     * 
+     * @param file
+     */
+    public FileFragment(OCFile file) {
+        mFile = file;
+    }
+

     /**
      * Getter for the hold {@link OCFile}
      * 
      * @return The {@link OCFile} hold
      */
     /**
      * Getter for the hold {@link OCFile}
      * 
      * @return The {@link OCFile} hold
      */

-    public OCFile getFile();
+    public OCFile getFile() {
+        return mFile;
+    }

     
     
     
     

+    protected void setFile(OCFile file) {
+        mFile = file;
+    }
+

     /**
      * Interface to implement by any Activity that includes some instance of FileFragment
      * 
      * @author David A. Velasco
      */
     /**
      * Interface to implement by any Activity that includes some instance of FileFragment
      * 
      * @author David A. Velasco
      */

-    public interface ContainerActivity extends TransferServiceGetter {
+    public interface ContainerActivity extends TransferServiceGetter, FileHandler {

 
         /**
          * Callback method invoked when the detail fragment wants to notice its container 
 
         /**
          * Callback method invoked when the detail fragment wants to notice its container 


@@ -66,10 +94,8 @@ public interface FileFragment {
          * 
          * @param file      File to show details
          */
          * 
          * @param file      File to show details
          */

-        public void showFragmentWithDetails(OCFile file);
-        
+        public void showDetails(OCFile file);

         
         

-        public void notifySuccessfulDownload(OCFile file, Intent intent, boolean success);

         
     }
     
         
     }