diff --git a/app/build.gradle b/app/build.gradle
index 9212db2..ac5af8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,10 +4,10 @@ android {
compileSdkVersion 28
defaultConfig {
applicationId "net.schueller.peertube"
- minSdkVersion 23
+ minSdkVersion 21
targetSdkVersion 28
- versionCode 106
- versionName "1.0.6"
+ versionCode 1010
+ versionName "1.0.10"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -44,11 +44,11 @@ android {
// implementation 'org.webrtc:google-webrtc:1.0.+'
// video player
- implementation 'com.google.android.exoplayer:exoplayer-core:2.8.1'
- implementation 'com.google.android.exoplayer:exoplayer-dash:2.8.1'
- implementation 'com.google.android.exoplayer:exoplayer-ui:2.8.1'
- implementation 'com.google.android.exoplayer:exoplayer-hls:2.8.1'
- implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.8.1'
+ implementation 'com.google.android.exoplayer:exoplayer-core:2.9.2'
+ implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.2'
+ implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.2'
+ implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.2'
+ implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.2'
// implementation 'com.devbrackets.android:exomedia:4.1.0'
// testing
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3e9107..d56e56e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
+
+
+
{
String stringValue = value.toString();
+ // check URL is valid
+ if (preference.getKey().equals("pref_api_base") && !Patterns.WEB_URL.matcher(stringValue).matches()) {
+ Toast.makeText(preference.getContext(), R.string.invalid_url, Toast.LENGTH_LONG).show();
+ return false;
+ }
+
preference.setSummary(stringValue);
return true;
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index d886539..b1cef54 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -206,14 +206,14 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
{
// get video ID
Intent intent = getIntent();
- String videoID = intent.getStringExtra(VideoListActivity.EXTRA_VIDEOID);
- Log.v(TAG, "click: " + videoID);
+ String videoUuid = intent.getStringExtra(VideoListActivity.EXTRA_VIDEOID);
+ Log.v(TAG, "click: " + videoUuid);
// get video details from api
String apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
- Call