Merge remote-tracking branch 'remotes/upstream/master' into beta

diff --cc res/layout/ssl_untrusted_cert_layout.xml
Simple merge

diff --cc res/values-ar/strings.xml
Simple merge

diff --cc res/values-az/strings.xml
Simple merge

diff --cc res/values-bg-rBG/strings.xml
Simple merge

diff --cc res/values-bn-rBD/strings.xml
Simple merge

diff --cc res/values-ca/strings.xml
Simple merge

diff --cc res/values-cs-rCZ/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de-rDE/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values-eo/strings.xml
Simple merge

diff --cc res/values-es-rAR/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
Simple merge

diff --cc res/values-et-rEE/strings.xml
Simple merge

diff --cc res/values-eu/strings.xml
Simple merge

diff --cc res/values-fi-rFI/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-gl/strings.xml
Simple merge

diff --cc res/values-he/strings.xml
Simple merge

diff --cc res/values-hu-rHU/strings.xml
Simple merge

diff --cc res/values-id/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-ja-rJP/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-lb/strings.xml
Simple merge

diff --cc res/values-lt-rLT/strings.xml
Simple merge

diff --cc res/values-mk/strings.xml
Simple merge

diff --cc res/values-nb-rNO/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-oc/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rBR/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-ro/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
Simple merge

diff --cc res/values-sk-rSK/strings.xml
Simple merge

diff --cc res/values-sl/strings.xml
Simple merge

diff --cc res/values-sr/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-th-rTH/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
Simple merge

diff --cc res/values-uk/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge

diff --cc src/com/owncloud/android/datamodel/OCFile.java
Simple merge

diff --cc src/com/owncloud/android/files/FileMenuFilter.java
Simple merge

diff --cc src/com/owncloud/android/operations/RefreshFolderOperation.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index a749b5c,8f813b8..a047ab3
--- 1/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
--- 2/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@@ -279,10 -266,10 +277,10 @@@ public class PreviewMediaFragment exten
      @Override
      public void onStart() {
          super.onStart();
-         Log_OC.e(TAG, "onStart");
+         Log_OC.v(TAG, "onStart");
  
          OCFile file = getFile();
 -        if (file != null && file.isDown()) {
 +        if (file != null) {
              if (file.isAudio()) {
                  bindMediaService();
  
@@@ -450,67 -437,9 +448,67 @@@
  
          // load the video file in the video player ; 
          // when done, VideoHelper#onPrepared() will be called
-         mVideoPreview.setVideoPath(mUri);
 +        if (getFile().isDown()) {
 +            mUri = getFile().getStoragePath();
 +        } else {
 +            Context context = MainApp.getAppContext();
 +            Account account = mContainerActivity.getStorageManager().getAccount();
 +
 +            mUri = generateUrlWithCredentials(account, context, getFile());
 +        }
 +
+         mVideoPreview.setVideoURI(getFile().getStorageUri());
      }
  
 +    public static String generateUrlWithCredentials(Account account, Context context, OCFile file){
 +        OwnCloudAccount ocAccount = null;
 +        try {
 +            ocAccount = new OwnCloudAccount(account, context);
 +
 +            final ClientGenerationTask task = new ClientGenerationTask();
 +            task.execute(ocAccount);
 +
 +            OwnCloudClient mClient = task.get();
 +            String url = AccountUtils.constructFullURLForAccount(context, account) + Uri.encode(file.getRemotePath(), "/");
 +            OwnCloudCredentials credentials = mClient.getCredentials();
 +
 +            return url.replace("//", "//" + credentials.getUsername() + ":" + credentials.getAuthToken() + "@");
 +
 +        } catch (AccountUtils.AccountNotFoundException e) {
 +            e.printStackTrace();
 +
 +        } catch (InterruptedException e) {
 +            e.printStackTrace();
 +        } catch (ExecutionException e) {
 +            e.printStackTrace();
 +        }
 +        return "";
 +    }
 +
 +    public static class ClientGenerationTask extends AsyncTask<Object, Void, OwnCloudClient> {
 +        @Override
 +        protected OwnCloudClient doInBackground(Object... params) {
 +            Object account = params[0];
 +            if (account instanceof OwnCloudAccount){
 +                try {
 +                    OwnCloudAccount ocAccount = (OwnCloudAccount) account;
 +                    return OwnCloudClientManagerFactory.getDefaultSingleton().
 +                            getClientFor(ocAccount, MainApp.getAppContext());
 +                } catch (AccountUtils.AccountNotFoundException e) {
 +                    e.printStackTrace();
 +                } catch (OperationCanceledException e) {
 +                    e.printStackTrace();
 +                } catch (AuthenticatorException e) {
 +                    e.printStackTrace();
 +                } catch (IOException e) {
 +                    e.printStackTrace();
 +                }
 +            }
 +
 +            return null;
 +        }
 +    }
 +
  
      private class VideoHelper implements OnCompletionListener, OnPreparedListener, OnErrorListener {
  
@@@ -576,14 -489,31 +558,14 @@@
           */
          @Override
          public boolean onError(MediaPlayer mp, int what, int extra) {
 -            Log_OC.e(TAG, "Error in video playback, what = " + what + ", extra = " + extra);
 -            if (mVideoPreview.getWindowToken() != null) {
 -                String message = MediaService.getMessageForMediaError(
 -                        getActivity(), what, extra);
 -                new AlertDialog.Builder(getActivity())
 -                        .setMessage(message)
 -                        .setPositiveButton(android.R.string.VideoView_error_button,
 -                                new DialogInterface.OnClickListener() {
 -                                    public void onClick(DialogInterface dialog, int whichButton) {
 -                                        dialog.dismiss();
 -                                        VideoHelper.this.onCompletion(null);
 -                                    }
 -                                })
 -                        .setCancelable(false)
 -                        .show();
 -            }
 +            MediaService.streamWithExternalApp(mUri, getActivity()).show();
              return true;
          }
 -
      }
  
 -
      @Override
      public void onPause() {
-         Log_OC.e(TAG, "onPause");
+         Log_OC.v(TAG, "onPause");
          super.onPause();
      }
  

diff --cc src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index 383b082,8972f3c..c1b4125
--- 1/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
--- 2/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@@ -204,14 -203,19 +203,14 @@@ public class PreviewVideoActivity exten
              file = getStorageManager().getFileById(file.getFileId()); 
              if (file != null) {
                  if (file.isDown()) {
-                     mVideoPlayer.setVideoPath(file.getStoragePath());
-                     
+                     mVideoPlayer.setVideoURI(file.getStorageUri());
+ 
                  } else {
 -                    // not working yet
                      String url;
 -                    try {
 -                        url = AccountUtils.constructFullURLForAccount(this, getAccount()) + file.getRemotePath();
 -                        mVideoPlayer.setVideoURI(Uri.parse(url));
 -                    } catch (AccountNotFoundException e) {
 -                        onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);
 -                    }
 +                    url = PreviewMediaFragment.generateUrlWithCredentials(getAccount(), getApplicationContext(), getFile());
 +                    mVideoPlayer.setVideoURI(Uri.parse(url));
                  }
-                 
+ 
                  // create and prepare control panel for the user
                  mMediaController = new MediaController(this);
                  mMediaController.setMediaPlayer(mVideoPlayer);