From 7233e6882e5b540e48b97e1134851ebac379532e Mon Sep 17 00:00:00 2001 From: stom79 Date: Thu, 24 Jan 2019 10:38:03 +0100 Subject: [PATCH] Some fixes --- .../mastodon/activities/MediaActivity.java | 63 ++++--------------- .../DisplayNotificationsFragment.java | 2 - .../gouv/etalab/mastodon/helper/Helper.java | 2 +- .../main/res/layout/drawer_notification.xml | 2 + 4 files changed, 16 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java index 1659380a8..eb780e115 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java @@ -41,11 +41,9 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import com.github.chrisbanes.photoview.OnMatrixChangedListener; import com.github.chrisbanes.photoview.PhotoView; -import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; -import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.ui.SimpleExoPlayerView; import com.google.android.exoplayer2.upstream.DataSource; @@ -424,7 +422,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { case "gifv": pbar_inf.setIndeterminate(false); pbar_inf.setScaleY(3f); - File file = new File(getCacheDir() + "/" + Helper.md5(url)+".mp4"); try { HttpsURLConnection.setDefaultSSLSocketFactory(new TLSSocketFactory()); } catch (KeyManagementException e) { @@ -432,53 +429,19 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } - if(file.exists()) { - Uri uri = Uri.parse(file.getAbsolutePath()); - videoView.setVisibility(View.VISIBLE); - - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), - Util.getUserAgent(getApplicationContext(), "Mastalab"), null); - - ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) - .createMediaSource(uri); - - player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this); - if( type.toLowerCase().equals("gifv")) { - AudioAttributes audioAttributes = new AudioAttributes.Builder() - .setUsage(C.USAGE_MEDIA) - .setContentType(C.CONTENT_TYPE_MOVIE) - .build(); - player.setAudioAttributes(audioAttributes); - player.setRepeatMode(Player.REPEAT_MODE_ONE); - } - videoView.setPlayer(player); - loader.setVisibility(View.GONE); - player.prepare(videoSource); - - - player.setPlayWhenReady(true); - fileVideo = file; - downloadedImage = null; - }else{ - videoView.setVisibility(View.VISIBLE); - Uri uri = Uri.parse(url); - - videoView.setVisibility(View.VISIBLE); - - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), - Util.getUserAgent(getApplicationContext(), "Mastalab"), null); - - ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) - .createMediaSource(uri); - - player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this); - if( type.toLowerCase().equals("gifv")) - player.setRepeatMode(Player.REPEAT_MODE_ONE); - videoView.setPlayer(player); - loader.setVisibility(View.GONE); - player.prepare(videoSource); - player.setPlayWhenReady(true); - } + videoView.setVisibility(View.VISIBLE); + Uri uri = Uri.parse(url); + DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), + Util.getUserAgent(getApplicationContext(), "Mastalab"), null); + ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) + .createMediaSource(uri); + player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this); + if( type.toLowerCase().equals("gifv")) + player.setRepeatMode(Player.REPEAT_MODE_ONE); + videoView.setPlayer(player); + loader.setVisibility(View.GONE); + player.prepare(videoSource); + player.setPlayWhenReady(true); break; } } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java index 8bd5ed0cb..fb5c86d40 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java @@ -28,7 +28,6 @@ import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.content.LocalBroadcastManager; import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -100,7 +99,6 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve lv_notifications = rootView.findViewById(R.id.lv_notifications); - lv_notifications.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); mainLoader = rootView.findViewById(R.id.loader); nextElementLoader = rootView.findViewById(R.id.loading_next_notifications); textviewNoAction = rootView.findViewById(R.id.no_action); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 0b849c91e..81ec8bd3d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -2825,7 +2825,7 @@ public class Helper { try (InputStream inputStream = context.getContentResolver().openInputStream(uriFile)) { assert inputStream != null; exif = new ExifInterface(inputStream); - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); } Matrix matrix = null; diff --git a/app/src/main/res/layout/drawer_notification.xml b/app/src/main/res/layout/drawer_notification.xml index 2306f4164..ac1fcfe5e 100644 --- a/app/src/main/res/layout/drawer_notification.xml +++ b/app/src/main/res/layout/drawer_notification.xml @@ -29,6 +29,8 @@ android:layout_marginEnd="5dp" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" + android:divider="?android:dividerHorizontal" + android:showDividers="end" android:orientation="vertical">