From 0a1336f0e0b988169cb7c7c75e827f4bdb8a22d2 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 18 Dec 2020 18:00:47 +0100
Subject: [PATCH] Release 1.10.2

---
 app/build.gradle                                  |  4 ++--
 .../app/fedilab/fedilabtube/PeertubeActivity.java | 15 +++++++++++----
 .../fedilabtube/client/PeertubeService.java       |  3 +++
 .../fedilabtube/client/RetrofitPeertubeAPI.java   | 13 +++++++++++++
 .../main/res/layout/exo_player_control_view.xml   | 11 +++++++++++
 .../metadata/android/en-US/changelogs/32.txt      | 13 +++++++++++++
 6 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 src/fdroid_full/fastlane/metadata/android/en-US/changelogs/32.txt

diff --git a/app/build.gradle b/app/build.gradle
index 4cc18ef..7931e55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 31
-        versionName "1.10.1"
+        versionCode 32
+        versionName "1.10.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
index d96d4de..f65e7f3 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
@@ -317,7 +317,10 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             sepiaSearch = b.getBoolean("sepia_search", false);
             peertube = b.getParcelable("video");
         }
-
+        new Thread(() -> {
+            String videoId = peertube != null ? peertube.getUuid() : videoUuid;
+            new RetrofitPeertubeAPI(PeertubeActivity.this).postView(videoId);
+        }).start();
         willPlayFromIntent = manageIntentUrl(intent);
 
         binding.peertubeDescriptionMore.setOnClickListener(v -> {
@@ -981,12 +984,16 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);
         DefaultTimeBar exo_progress = controlView.findViewById(R.id.exo_progress);
         TextView exo_duration = controlView.findViewById(R.id.exo_duration);
+        TextView exo_live_badge = controlView.findViewById(R.id.exo_live_badge);
         if (peertube.isLive()) {
-            exo_progress.setVisibility(View.GONE);
-            exo_duration.setText(R.string.live);
-            exo_duration.setBackgroundResource(R.drawable.rounded_live);
+            exo_progress.setVisibility(View.INVISIBLE);
+            exo_duration.setVisibility(View.GONE);
+            exo_live_badge.setVisibility(View.VISIBLE);
+            exo_live_badge.setText(R.string.live);
+            exo_live_badge.setBackgroundResource(R.drawable.rounded_live);
         } else {
             exo_progress.setVisibility(View.VISIBLE);
+            exo_live_badge.setVisibility(View.GONE);
             exo_duration.setBackground(null);
         }
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
index a2c8031..73c7dc1 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
@@ -310,6 +310,9 @@ public interface PeertubeService {
             @Query("nsfw") boolean nsfw
     );
 
+    @POST("videos/{id}/views")
+    Call<String> postView(@Path("id") String id);
+
     @Multipart
     @PUT("videos/{id}")
     Call<String> updateVideo(
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java b/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
index 3946ef6..651eb3f 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
@@ -255,6 +255,19 @@ public class RetrofitPeertubeAPI {
     }
 
 
+    /**
+     * POST a view count for a video
+     */
+    public void postView(String videoUuid) {
+        PeertubeService peertubeService = init();
+        Call<String> postViewCall = peertubeService.postView(videoUuid);
+        try {
+            Response<String> dd = postViewCall.execute();
+        } catch (IOException ignored) {
+        }
+    }
+
+
     /**
      * Retrieve notifications
      *
diff --git a/app/src/main/res/layout/exo_player_control_view.xml b/app/src/main/res/layout/exo_player_control_view.xml
index 6b35d36..79cf0f2 100644
--- a/app/src/main/res/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layout/exo_player_control_view.xml
@@ -103,6 +103,17 @@
             android:textColor="#FFBEBEBE"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/exo_live_badge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
+            android:textColor="#FFF"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <FrameLayout
             android:id="@+id/exo_fullscreen_button"
             android:layout_width="32dp"
diff --git a/src/fdroid_full/fastlane/metadata/android/en-US/changelogs/32.txt b/src/fdroid_full/fastlane/metadata/android/en-US/changelogs/32.txt
new file mode 100644
index 0000000..15217dd
--- /dev/null
+++ b/src/fdroid_full/fastlane/metadata/android/en-US/changelogs/32.txt
@@ -0,0 +1,13 @@
+Added:
+- Live stream badge
+- Increment view count when watching a video
+
+Changed:
+- Seek bar hidden with lives
+- Add a message if the live has not yet started
+
+Fixed:
+- Do not list not honored when no accounts connected
+- Comments with replies show overlap
+- Mastodon accounts show errors
+- Accounts not found issue
\ No newline at end of file