greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crashes when invalid URL is provided

Browse Source
This commit is contained in:
Stefan Schueller 2020-08-30 15:52:27 +02:00
parent 202b761667
commit 95353ca673
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
View File

@ -59,6 +59,7 @@ import com.mikepenz.iconics.IconicsDrawable;
import net.schueller.peertube.R; import net.schueller.peertube.R;
import net.schueller.peertube.adapter.VideoAdapter; import net.schueller.peertube.adapter.VideoAdapter;
import net.schueller.peertube.helper.APIUrlHelper; import net.schueller.peertube.helper.APIUrlHelper;
import net.schueller.peertube.model.Video;
import net.schueller.peertube.model.VideoList; import net.schueller.peertube.model.VideoList;
import net.schueller.peertube.network.GetUserService; import net.schueller.peertube.network.GetUserService;
import net.schueller.peertube.network.GetVideoDataService; import net.schueller.peertube.network.GetVideoDataService;
@ -348,7 +349,10 @@ public class VideoListActivity extends CommonActivity {
} }
if (response.body() != null) { if (response.body() != null) {
videoAdapter.setData(response.body().getVideoArrayList()); ArrayList<Video> videoList = response.body().getVideoArrayList();
if (videoList != null) {
videoAdapter.setData(response.body().getVideoArrayList());
}
} }
// no results show no results message // no results show no results message

46
app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
View File

@ -33,6 +33,7 @@ import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.webkit.URLUtil;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.media.MediaDescriptionCompat; import android.support.v4.media.MediaDescriptionCompat;
@ -70,21 +71,25 @@ import static net.schueller.peertube.activity.VideoListActivity.EXTRA_VIDEOID;
public class VideoPlayerService extends Service { public class VideoPlayerService extends Service {
private static final String TAG = "VideoPlayerService"; private static final String TAG = "VideoPlayerService";
private static final String MEDIA_SESSION_TAG = "peertube_player"; private static final String MEDIA_SESSION_TAG = "peertube_player";
private final IBinder mBinder = new LocalBinder(); private final IBinder mBinder = new LocalBinder();
private static final String PLAYBACK_CHANNEL_ID = "playback_channel"; private static final String PLAYBACK_CHANNEL_ID = "playback_channel";
private static final Integer PLAYBACK_NOTIFICATION_ID = 1; private static final Integer PLAYBACK_NOTIFICATION_ID = 1;
public SimpleExoPlayer player; public SimpleExoPlayer player;
private Video currentVideo; private Video currentVideo;
private String currentStreamUrl; private String currentStreamUrl;
private PlayerNotificationManager playerNotificationManager; private PlayerNotificationManager playerNotificationManager;
private IntentFilter becomeNoisyIntentFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY); private IntentFilter becomeNoisyIntentFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
private BecomingNoisyReceiver myNoisyAudioStreamReceiver = new BecomingNoisyReceiver(); private BecomingNoisyReceiver myNoisyAudioStreamReceiver = new BecomingNoisyReceiver();
@Override @Override
@ -105,13 +110,14 @@ public class VideoPlayerService extends Service {
registerReceiver(myNoisyAudioStreamReceiver, becomeNoisyIntentFilter); registerReceiver(myNoisyAudioStreamReceiver, becomeNoisyIntentFilter);
} }
if (playbackState == ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped if (playbackState
== ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped
Log.v(TAG, "ACTION_PAUSE: " + playbackState); Log.v(TAG, "ACTION_PAUSE: " + playbackState);
unregisterReceiver(myNoisyAudioStreamReceiver); unregisterReceiver(myNoisyAudioStreamReceiver);
myNoisyAudioStreamReceiver=null; myNoisyAudioStreamReceiver = null;
} }
} }
} ); });
} }
@ -133,7 +139,7 @@ public class VideoPlayerService extends Service {
} }
//Was seeing an error when exiting the program about about not unregistering the receiver. //Was seeing an error when exiting the program about about not unregistering the receiver.
try { try {
if (null!=myNoisyAudioStreamReceiver) { if (null != myNoisyAudioStreamReceiver) {
this.unregisterReceiver(myNoisyAudioStreamReceiver); this.unregisterReceiver(myNoisyAudioStreamReceiver);
} }
} catch (Exception e) { } catch (Exception e) {
@ -156,22 +162,23 @@ public class VideoPlayerService extends Service {
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
Context context = this; Context context = this;
Log.v(TAG, "onStartCommand..."); Log.v(TAG, "onStartCommand...");
if(currentStreamUrl == null){
Toast.makeText(context, "currentStreamUrl must not null", Toast.LENGTH_SHORT).show(); if (!URLUtil.isValidUrl(currentStreamUrl)) {
Toast.makeText(context, "Invalid URL provided. Unable to play video.", Toast.LENGTH_SHORT).show();
return START_NOT_STICKY;
} else {
playVideo();
return START_STICKY;
} }
playVideo();
return START_STICKY;
} }
public void setCurrentVideo(Video video) public void setCurrentVideo(Video video) {
{
Log.v(TAG, "setCurrentVideo..."); Log.v(TAG, "setCurrentVideo...");
currentVideo = video; currentVideo = video;
} }
public void setCurrentStreamUrl(String streamUrl) public void setCurrentStreamUrl(String streamUrl) {
{
Log.v(TAG, "setCurrentStreamUrl..." + streamUrl); Log.v(TAG, "setCurrentStreamUrl..." + streamUrl);
currentStreamUrl = streamUrl; currentStreamUrl = streamUrl;
} }
@ -184,6 +191,7 @@ public class VideoPlayerService extends Service {
/** /**
* Returns the current playback speed of the player. * Returns the current playback speed of the player.
*
* @return the current playback speed of the player. * @return the current playback speed of the player.
*/ */
public float getPlayBackSpeed() { public float getPlayBackSpeed() {
@ -193,6 +201,8 @@ public class VideoPlayerService extends Service {
public void playVideo() { public void playVideo() {
Context context = this; Context context = this;
// We need a valid URL
Log.v(TAG, "playVideo..."); Log.v(TAG, "playVideo...");
// Produces DataSource instances through which media data is loaded. // Produces DataSource instances through which media data is loaded.
@ -242,7 +252,8 @@ public class VideoPlayerService extends Service {
@Nullable @Nullable
@Override @Override
public Bitmap getCurrentLargeIcon(Player player, PlayerNotificationManager.BitmapCallback callback) { public Bitmap getCurrentLargeIcon(Player player,
PlayerNotificationManager.BitmapCallback callback) {
return null; return null;
} }
} }
@ -297,15 +308,16 @@ public class VideoPlayerService extends Service {
// Audio Focus // Audio Focus
AudioAttributes audioAttributes = new AudioAttributes.Builder() AudioAttributes audioAttributes = new AudioAttributes.Builder()
.setUsage(C.USAGE_MEDIA) .setUsage(C.USAGE_MEDIA)
.setContentType(C.CONTENT_TYPE_MOVIE) .setContentType(C.CONTENT_TYPE_MOVIE)
.build(); .build();
player.setAudioAttributes(audioAttributes,true); player.setAudioAttributes(audioAttributes, true);
} }
// pause playback on audio output change // pause playback on audio output change
private class BecomingNoisyReceiver extends BroadcastReceiver { private class BecomingNoisyReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (AudioManager.ACTION_AUDIO_BECOMING_NOISY.equals(intent.getAction())) { if (AudioManager.ACTION_AUDIO_BECOMING_NOISY.equals(intent.getAction())) {