Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Some fixes

This commit is contained in:
stom79 2019-01-24 10:38:03 +01:00
parent cac04e4a74
commit 7233e6882e
4 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
View File

@ -41,11 +41,9 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.request.transition.Transition;
import com.github.chrisbanes.photoview.OnMatrixChangedListener; import com.github.chrisbanes.photoview.OnMatrixChangedListener;
import com.github.chrisbanes.photoview.PhotoView; import com.github.chrisbanes.photoview.PhotoView;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer; 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.source.ExtractorMediaSource;
import com.google.android.exoplayer2.ui.SimpleExoPlayerView; import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
@ -424,7 +422,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
case "gifv": case "gifv":
pbar_inf.setIndeterminate(false); pbar_inf.setIndeterminate(false);
pbar_inf.setScaleY(3f); pbar_inf.setScaleY(3f);
File file = new File(getCacheDir() + "/" + Helper.md5(url)+".mp4");
try { try {
HttpsURLConnection.setDefaultSSLSocketFactory(new TLSSocketFactory()); HttpsURLConnection.setDefaultSSLSocketFactory(new TLSSocketFactory());
} catch (KeyManagementException e) { } catch (KeyManagementException e) {
@ -432,53 +429,19 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
e.printStackTrace(); e.printStackTrace();
} }
if(file.exists()) { videoView.setVisibility(View.VISIBLE);
Uri uri = Uri.parse(file.getAbsolutePath()); Uri uri = Uri.parse(url);
videoView.setVisibility(View.VISIBLE); DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(),
Util.getUserAgent(getApplicationContext(), "Mastalab"), null);
DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory)
Util.getUserAgent(getApplicationContext(), "Mastalab"), null); .createMediaSource(uri);
player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this);
ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) if( type.toLowerCase().equals("gifv"))
.createMediaSource(uri); player.setRepeatMode(Player.REPEAT_MODE_ONE);
videoView.setPlayer(player);
player = ExoPlayerFactory.newSimpleInstance(MediaActivity.this); loader.setVisibility(View.GONE);
if( type.toLowerCase().equals("gifv")) { player.prepare(videoSource);
AudioAttributes audioAttributes = new AudioAttributes.Builder() player.setPlayWhenReady(true);
.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);
}
break; break;
} }
} }

2
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
View File

@ -28,7 +28,6 @@ import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; 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 = rootView.findViewById(R.id.lv_notifications);
lv_notifications.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL));
mainLoader = rootView.findViewById(R.id.loader); mainLoader = rootView.findViewById(R.id.loader);
nextElementLoader = rootView.findViewById(R.id.loading_next_notifications); nextElementLoader = rootView.findViewById(R.id.loading_next_notifications);
textviewNoAction = rootView.findViewById(R.id.no_action); textviewNoAction = rootView.findViewById(R.id.no_action);

2
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -2825,7 +2825,7 @@ public class Helper {
try (InputStream inputStream = context.getContentResolver().openInputStream(uriFile)) { try (InputStream inputStream = context.getContentResolver().openInputStream(uriFile)) {
assert inputStream != null; assert inputStream != null;
exif = new ExifInterface(inputStream); exif = new ExifInterface(inputStream);
} catch (IOException e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
Matrix matrix = null; Matrix matrix = null;

2
app/src/main/res/layout/drawer_notification.xml
View File

@ -29,6 +29,8 @@
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:divider="?android:dividerHorizontal"
android:showDividers="end"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"