Skip to content

Fix crash when displaying video files #4156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Jun 20, 2019
Merged

Fix crash when displaying video files #4156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/main/java/com/nextcloud/client/di/ComponentsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,8 @@ abstract class ComponentsModule {
@ContributesAndroidInjector abstract PreviewMediaFragment previewMediaFragment();
@ContributesAndroidInjector abstract PreviewTextFragment previewTextFragment();

@ContributesAndroidInjector
abstract ReceiveExternalFilesActivity.DialogMultipleAccount dialogMultipleAccount();

@ContributesAndroidInjector
abstract ReceiveExternalFilesActivity.DialogInputUploadFilename dialogInputUploadFilename();
@ContributesAndroidInjector abstract ReceiveExternalFilesActivity.DialogMultipleAccount dialogMultipleAccount();
@ContributesAndroidInjector abstract ReceiveExternalFilesActivity.DialogInputUploadFilename dialogInputUploadFilename();

@ContributesAndroidInjector abstract FileUploader fileUploader();
@ContributesAndroidInjector abstract FileDownloader fileDownloader();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,8 +1047,8 @@ private static ResizedImageGenerationTask getResizedImageGenerationWorkerTask(Im
}

public static Bitmap addVideoOverlay(Bitmap thumbnail){
Bitmap playButton = BitmapFactory.decodeResource(MainApp.getAppContext().getResources(),
R.drawable.view_play);
Drawable playButtonDrawable = MainApp.getAppContext().getResources().getDrawable(R.drawable.view_play);
Bitmap playButton = BitmapUtils.drawableToBitmap(playButtonDrawable);

Bitmap resizedPlayButton = Bitmap.createScaledBitmap(playButton,
(int) (thumbnail.getWidth() * 0.3),
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import android.widget.VideoView;

import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.di.Injectable;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.FileMenuFilter;
Expand Down Expand Up @@ -92,7 +93,7 @@
* By now, if the {@link OCFile} passed is not downloaded, an {@link IllegalStateException} is
* generated on instantiation too.
*/
public class PreviewMediaFragment extends FileFragment implements OnTouchListener {
public class PreviewMediaFragment extends FileFragment implements OnTouchListener, Injectable {

private static final String TAG = PreviewMediaFragment.class.getSimpleName();

Expand Down