Merge branch 'develop' into 'master'

fix: incorrect model preventing video playback

See merge request sschueller/peertube!15

CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 1.0.55 Tag: v1.0.55 (2021-01-29)
+ - Fixed incorrect model preventing video playback
+
 ### Version 1.0.54 Tag: v1.0.54 (2021-01-24)
  - Added HLS playback support
 

app/src/main/java/net/schueller/peertube/model/Redundancy.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package net.schueller.peertube.model;
+
+public class Redundancy {
+
+    private String baseUrl;
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public void setBaseUrl(final String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+}

app/src/main/java/net/schueller/peertube/model/StreamingPlaylist.java

@@ -24,7 +24,7 @@ public class StreamingPlaylist {
     private Integer type;
     private String playlistUrl;
     private String segmentsSha256Url;
-    private ArrayList<String> redundancies;
+    private ArrayList<Redundancy> redundancies;
     private ArrayList<File> files;
 
     public Integer getId() {
@@ -59,11 +59,11 @@ public class StreamingPlaylist {
         this.segmentsSha256Url = segmentsSha256Url;
     }
 
-    public ArrayList<String> getRedundancies() {
+    public ArrayList<Redundancy> getRedundancies() {
         return redundancies;
     }
 
-    public void setRedundancies(final ArrayList<String> redundancies) {
+    public void setRedundancies(final ArrayList<Redundancy> redundancies) {
         this.redundancies = redundancies;
     }
 

fastlane/metadata/android/en-US/changelogs/1055.txt

@@ -0,0 +1 @@
+ - Fixed incorrect model preventing video playback