hd vids! (#228)

Upgrading ExoPlayer to 2.7.0 and supporting HLS videos.
kickstarter · Mar 21, 2018 · 1cecb8b · 1cecb8b
1 parent 5f31d18
commit 1cecb8b
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 290 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -146,7 +146,7 @@ dependencies {
     annotationProcessor 'com.github.frankiesardo:auto-parcel-processor:0.3.1'
     compile 'com.google.android.gms:play-services-gcm:10.0.1'
     compile 'com.google.android.gms:play-services-wallet:10.0.1'
-    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
+    compile 'com.google.android.exoplayer:exoplayer:2.7.0'
     compile 'com.google.dagger:dagger:2.8'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.8'
     compile 'com.jakewharton:butterknife:7.0.1'
@@ -185,7 +185,7 @@ dependencies {
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.android.support.test:rules:0.5'
     androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support:support-annotations:25.1.0'
+    androidTestCompile 'com.android.support:support-annotations:27.0.0'
 }
 
 // SHA and timestamp caching courtesy of https://github.com/gdg-x/frisbee/blob/develop/app/build.gradle#L193-L218

diff --git a/app/src/main/java/com/kickstarter/libs/KSRendererBuilder.java b/app/src/main/java/com/kickstarter/libs/KSRendererBuilder.java
diff --git a/app/src/main/java/com/kickstarter/libs/KSVideoPlayer.java b/app/src/main/java/com/kickstarter/libs/KSVideoPlayer.java
diff --git a/app/src/main/java/com/kickstarter/models/Video.java b/app/src/main/java/com/kickstarter/models/Video.java
@@ -13,13 +13,15 @@ public abstract class Video implements Parcelable {
   public abstract String base();
   public abstract String frame();
   public abstract String high();
+  public abstract @Nullable String hls();
   public abstract @Nullable String webm();
 
   @AutoParcel.Builder
   public abstract static class Builder {
     public abstract Builder base(String __);
     public abstract Builder frame(String __);
     public abstract Builder high(String __);
+    public abstract Builder hls(String __);
     public abstract Builder webm(String __);
     public abstract Video build();
   }

diff --git a/app/src/main/java/com/kickstarter/services/interceptors/WebRequestInterceptor.java b/app/src/main/java/com/kickstarter/services/interceptors/WebRequestInterceptor.java
@@ -48,7 +48,7 @@ private Request request(final @NonNull Request initialRequest) {
     }
 
     final Request.Builder requestBuilder = initialRequest.newBuilder()
-      .header("User-Agent", userAgent());
+      .header("User-Agent", userAgent(this.build));
 
     final String basicAuthorizationHeader = this.internalTools.basicAuthorizationHeader();
     if (this.currentUser.exists()) {
@@ -75,15 +75,15 @@ private boolean shouldAddBasicAuthorizationHeader(final @NonNull Request request
     return KSUri.isHivequeenUri(initialRequestUri, this.endpoint) || KSUri.isStagingUri(initialRequestUri, this.endpoint);
   }
 
-  private @NonNull String userAgent() {
+  public static @NonNull String userAgent(final @NonNull Build build) {
     // TODO: Check whether device is mobile or tablet, append to user agent
     return new StringBuilder()
       .append("Kickstarter Android Mobile Variant/")
-      .append(this.build.variant())
+      .append(build.variant())
       .append(" Code/")
-      .append(this.build.versionCode())
+      .append(build.versionCode())
       .append(" Version/")
-      .append(this.build.versionName())
+      .append(build.versionName())
       .toString();
   }
 }