tidy up

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 549b763..66cd79d 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -23,12 +23,7 @@
 package com.owncloud.android.ui.fragment;
 
 import android.accounts.Account;
 package com.owncloud.android.ui.fragment;
 
 import android.accounts.Account;

-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;

 import android.app.Activity;
 import android.app.Activity;

-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;

 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;


@@ -47,9 +42,7 @@ import android.widget.PopupMenu;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;

-import com.owncloud.android.lib.common.OwnCloudBasicCredentials;
-import com.owncloud.android.lib.common.OwnCloudCredentials;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;


@@ -66,11 +59,10 @@ import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;

-import com.owncloud.android.utils.FileStorageUtils;

 import com.owncloud.android.ui.preview.PreviewTextFragment;
 import com.owncloud.android.ui.preview.PreviewTextFragment;

+import com.owncloud.android.utils.FileStorageUtils;

 
 import java.io.File;
 
 import java.io.File;

-import java.io.IOException;

 
 /**
  * A Fragment that lists all files and folders in a given path.
 
 /**
  * A Fragment that lists all files and folders in a given path.


@@ -391,70 +383,13 @@ public class OCFileListFragment extends ExtendedListFragment implements FileActi
             }
             case R.id.action_send_file: {
                 // Obtain the file
             }
             case R.id.action_send_file: {
                 // Obtain the file

-//                if (!mTargetFile.isDown()) {  // Download the file
-//                    Log_OC.d(TAG, mTargetFile.getRemotePath() + " : File must be downloaded");
-//                    ((FileDisplayActivity) mContainerActivity).startDownloadForSending(mTargetFile);
-//
-//                } else {
-                    // mContainerActivity.getFileOperationsHelper().sendDownloadedFile(mTargetFile);
-
-//                String url = "https://test:teddy03@192.168.0.100/owncloud/remote.php/webdav/2/1.ogg";
-//                String url = "https://test:test@demo.owncloud.org/remote.php/webdav/Demo%20Movie%20OGG%20-%20Big%20Buck%20Bunny%20Trailer.ogg";
+                if (!mTargetFile.isDown()) {  // Download the file
+                    Log_OC.d(TAG, mTargetFile.getRemotePath() + " : File must be downloaded");
+                    ((FileDisplayActivity) mContainerActivity).startDownloadForSending(mTargetFile);

 
 

-
-//                try{
-//                    Intent i = new Intent(Intent.ACTION_VIEW);
-//                    i.setComponent(new ComponentName("org.videolan.vlc.betav7neon", "org.videolan.vlc.betav7neon.gui.video.VideoPlayerActivity"));
-//                    i.setData(Uri.parse(url));
-//                    startActivity(i);
-//                }
-//                catch (ActivityNotFoundException e){
-//                    Uri uri = Uri.parse("http://play.google.com/store/apps/details?id=org.videolan.vlc.betav7neon");
-//                    Intent intent = new Intent (Intent.ACTION_VIEW, uri);
-//                    startActivity(intent);
-//                }
-//
-
-                // TODO TOBI neuer Menüpunkt: Stream
-
-                try {
-                    Context context = MainApp.getAppContext();
-                    Account account = mContainerActivity.getStorageManager().getAccount();
-                    String url = AccountUtils.constructFullURLForAccount(context, account) + mTargetFile.getRemotePath();
-
-                    OwnCloudCredentials credentials = AccountUtils.getCredentialsForAccount(context, account);
-
-                    url = url.replace("//", "//" + credentials.getUsername() + ":" + credentials.getAuthToken() + "@");
-
-                    Log_OC.d(TAG, "Streaming url: " + url);
-                    // VLC
-                    Intent i = new Intent(Intent.ACTION_VIEW);
-                    i.setComponent(new ComponentName("org.videolan.vlc.betav7neon", "org.videolan.vlc.betav7neon.gui.video.VideoPlayerActivity"));
-                    i.setData(Uri.parse(url));
-                    startActivity(i);
-
-                    // MX
-//                    Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-//                    i.setData(Uri.parse(url));
-//                    startActivity(i);
-                } catch (AccountUtils.AccountNotFoundException e) {
-                    e.printStackTrace();
-                }
-                catch (ActivityNotFoundException e) {
-                    // VLC
-                    Uri uri = Uri.parse("http://play.google.com/store/apps/details?id=org.videolan.vlc.betav7neon");
-                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                    startActivity(intent);
-                } catch (AuthenticatorException e) {
-                    e.printStackTrace();
-                } catch (OperationCanceledException e) {
-                    e.printStackTrace();
-                } catch (IOException e) {
-                    e.printStackTrace();
+                } else {
+                    mContainerActivity.getFileOperationsHelper().sendDownloadedFile(mTargetFile);

                 }
                 }

-
-
-//                }

                 return true;
             }
             case R.id.action_stream_file: {
                 return true;
             }
             case R.id.action_stream_file: {


@@ -615,8 +550,8 @@ public class OCFileListFragment extends ExtendedListFragment implements FileActi
             setFooterText(generateFooterText(filesCount, foldersCount));
 
             // decide grid vs list view
             setFooterText(generateFooterText(filesCount, foldersCount));
 
             // decide grid vs list view

-            OwnCloudVersion version = com.owncloud.android.authentication.AccountUtils.getServerVersion(
-                    ((FileActivity)mContainerActivity).getAccount());
+            OwnCloudVersion version = AccountUtils.getServerVersion(
+                    ((FileActivity) mContainerActivity).getAccount());

             if (version != null && version.supportsRemoteThumbnails() &&
                 imagesCount > 0 && imagesCount == filesCount) {
                 switchToGridView();
             if (version != null && version.supportsRemoteThumbnails() &&
                 imagesCount > 0 && imagesCount == filesCount) {
                 switchToGridView();