mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when displaying video files

Browse source 
1) Bitmap decoder does not work with vector drawables directly
2) Dependency injection in PreviewMediaFragment

Fixes #4121
Fixes #4129
Fixes #4150

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
This commit is contained in:
Chris Narkiewicz 2019-06-16 14:58:00 +01:00
parent f41885b62a
commit 38c7605ef5
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/nextcloud/client/di/ComponentsModule.java
View file

@ -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();

4
src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file

@ -1047,8 +1047,8 @@ public final class ThumbnailsCacheManager {
}
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),

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

@ -55,6 +55,7 @@ import android.widget.Toast;
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;
@ -92,7 +93,7 @@ import androidx.annotation.StringRes;
* 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();