mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Changes due to CR

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2018-06-27 11:46:48 +02:00 committed by AndyScherzinger
parent f7039115be
commit 5b1a011bff
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
View file

@ -352,28 +352,25 @@ public class FileOperationsHelper {
public void streamMediaFile(OCFile file) {
mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
new Thread(new Runnable() {
@Override
public void run() {
Account account = AccountUtils.getCurrentOwnCloudAccount(mFileActivity);
StreamMediaFileOperation sfo = new StreamMediaFileOperation(file.getLocalId());
RemoteOperationResult result = sfo.execute(account, mFileActivity);
new Thread(() -> {
Account account = AccountUtils.getCurrentOwnCloudAccount(mFileActivity);
StreamMediaFileOperation sfo = new StreamMediaFileOperation(file.getLocalId());
RemoteOperationResult result = sfo.execute(account, mFileActivity);
mFileActivity.dismissLoadingDialog();
mFileActivity.dismissLoadingDialog();
if (!result.isSuccess()) {
DisplayUtils.showSnackMessage(mFileActivity, R.string.stream_not_possible_headline);
return;
}
Intent openFileWithIntent = new Intent(Intent.ACTION_VIEW);
Uri uri = Uri.parse((String) result.getData().get(0));
openFileWithIntent.setDataAndType(uri, file.getMimetype());
mFileActivity.startActivity(Intent.createChooser(openFileWithIntent,
mFileActivity.getString(R.string.stream)));
if (!result.isSuccess()) {
DisplayUtils.showSnackMessage(mFileActivity, R.string.stream_not_possible_headline);
return;
}
Intent openFileWithIntent = new Intent(Intent.ACTION_VIEW);
Uri uri = Uri.parse((String) result.getData().get(0));
openFileWithIntent.setDataAndType(uri, file.getMimetype());
mFileActivity.startActivity(Intent.createChooser(openFileWithIntent,
mFileActivity.getString(R.string.stream)));
}).start();
}

2
src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

@ -512,7 +512,7 @@ public class PreviewMediaFragment extends FileFragment implements
new LoadStreamUrl(this, client).execute(getFile().getLocalId());
} catch (Exception e) {
Log_OC.e(TAG, "Loading stream url not possible: " + e.getMessage());
Log_OC.e(TAG, "Loading stream url not possible: " + e);
}
}
}