From 4c4373e7899c6378d82b534926d97b9a55c7cd64 Mon Sep 17 00:00:00 2001
From: Steven Schoen <steven@stevenschoen.com>
Date: Sun, 1 Oct 2017 16:07:45 -0700
Subject: [PATCH] Fix opening downloaded non-MP4 videos, fix analytics logging

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  4 --
 .../com/stevenschoen/putionew/Analytics.kt    | 35 +++++++--------
 .../putionew/files/DownloadFinishedService.kt | 14 +++---
 .../putionew/files/FileDetailsFragment.kt     | 15 +++++--
 .../putionew/files/FileFinishedActivity.kt    | 43 -------------------
 6 files changed, 38 insertions(+), 75 deletions(-)
 delete mode 100644 app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt

diff --git a/app/build.gradle b/app/build.gradle
index 37c348eb..0656d7aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         applicationId 'com.stevenschoen.putionew'
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 125
+        versionCode 126
         versionName '4.2'
         multiDexEnabled true
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d72c87a..018fb0bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,10 +67,6 @@
 		<activity
 			android:name=".LoginActivity"
 			android:theme="@style/Theme.Putio.Login"/>
-		<activity
-			android:name=".files.FileFinishedActivity"
-			android:label="@string/downloadfinishedopentitle"
-			android:theme="@style/Putio.Dialog"/>
 		<activity
 			android:name=".transfers.add.AddTransferActivity"
 			android:excludeFromRecents="true"
diff --git a/app/src/main/java/com/stevenschoen/putionew/Analytics.kt b/app/src/main/java/com/stevenschoen/putionew/Analytics.kt
index 5408935a..d646dfe9 100644
--- a/app/src/main/java/com/stevenschoen/putionew/Analytics.kt
+++ b/app/src/main/java/com/stevenschoen/putionew/Analytics.kt
@@ -27,50 +27,51 @@ class Analytics(context: Context) {
 
     fun logViewedFile(file: PutioFile) {
         makeFileBundle(file)
-                .log(FirebaseAnalytics.Event.VIEW_ITEM)
+                .logEvent(FirebaseAnalytics.Event.VIEW_ITEM)
     }
 
     fun logBrowsedToFolder(folder: PutioFile) {
         makeFolderBundle(folder)
-                .log(Event.VIEW_FOLDER)
+                .logEvent(Event.VIEW_FOLDER)
     }
 
     fun logSearched(query: String) {
-        Bundle().putString(FirebaseAnalytics.Param.SEARCH_TERM, query)
-                .log(FirebaseAnalytics.Event.SEARCH)
+        Bundle().apply {
+            putString(FirebaseAnalytics.Param.SEARCH_TERM, query)
+        }.logEvent(FirebaseAnalytics.Event.SEARCH)
     }
 
     fun logStartedFileDownload(file: PutioFile) {
         makeFileBundle(file)
-                .log(Event.DOWNLOAD_ITEM)
+                .logEvent(Event.DOWNLOAD_ITEM)
     }
 
     fun logStartedVideoDownload(video: PutioFile, mp4: Boolean) {
-        makeFileBundle(video)
-                .putBoolean(Param.MP4_SELECTED, mp4)
-                .log(Event.DOWNLOAD_ITEM)
+        makeFileBundle(video).apply {
+            putBoolean(Param.MP4_SELECTED, mp4)
+        }.logEvent(Event.DOWNLOAD_ITEM)
     }
 
     fun logDownloadFinished(file: PutioFile) {
         makeFileBundle(file)
-                .log(Event.FINISH_DOWNLOAD)
+                .logEvent(Event.FINISH_DOWNLOAD)
     }
 
     fun logOpenedDownloadedFile(file: PutioFile) {
         makeFileBundle(file)
-                .log(Event.OPEN_DOWNLOADED_FILE)
+                .logEvent(Event.OPEN_DOWNLOADED_FILE)
     }
 
     fun logOpenedDownloadedVideo(video: PutioFile, mp4: Boolean) {
-        makeFileBundle(video)
-                .putBoolean(Param.MP4_SELECTED, mp4)
-                .log(Event.OPEN_DOWNLOADED_VIDEO)
+        makeFileBundle(video).apply {
+            putBoolean(Param.MP4_SELECTED, mp4)
+        }.logEvent(Event.OPEN_DOWNLOADED_VIDEO)
     }
 
     fun logStreamedVideo(video: PutioFile, mp4: Boolean) {
-        makeFileBundle(video)
-                .putBoolean(Param.MP4_SELECTED, mp4)
-                .log(Event.STREAM_VIDEO)
+        makeFileBundle(video).apply {
+            putBoolean(Param.MP4_SELECTED, mp4)
+        }.logEvent(Event.STREAM_VIDEO)
     }
 
     private fun makeFileBundle(file: PutioFile) = Bundle().apply { addBasicFileInfo(file) }
@@ -88,7 +89,7 @@ class Analytics(context: Context) {
         putString(FirebaseAnalytics.Param.ITEM_NAME, file.name)
     }
 
-    private fun Bundle.log(event: String) = putioApp.firebaseAnalytics.logEvent(event, this)
+    private fun Bundle.logEvent(event: String) = putioApp.firebaseAnalytics.logEvent(event, this)
 }
 
 val Context.analytics
diff --git a/app/src/main/java/com/stevenschoen/putionew/files/DownloadFinishedService.kt b/app/src/main/java/com/stevenschoen/putionew/files/DownloadFinishedService.kt
index e6f16837..adf308c5 100644
--- a/app/src/main/java/com/stevenschoen/putionew/files/DownloadFinishedService.kt
+++ b/app/src/main/java/com/stevenschoen/putionew/files/DownloadFinishedService.kt
@@ -35,15 +35,15 @@ class DownloadFinishedService : JobIntentService() {
                     status = FileDownload.Status.Downloaded
                     uri = downloadManager.getUriForDownloadedFile(downloadId).toString()
                 })
+
+                putioApp.fileDownloadDatabase.fileDownloadsDao()
+                        .getByDownloadId(downloadId)
+                        .map { it.fileId }
+                        .flatMapSingle(putioApp.putioUtils!!.restInterface::file)
+                        .map { it.file }
+                        .subscribe(analytics::logDownloadFinished)
             }
         }
-
-        putioApp.fileDownloadDatabase.fileDownloadsDao()
-                .getByDownloadId(downloadId)
-                .map { it.fileId }
-                .flatMapSingle(putioApp.putioUtils!!.restInterface::file)
-                .map { it.file }
-                .subscribe(analytics::logDownloadFinished)
     }
 }
 
diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt
index 9df342b5..df3b2f83 100644
--- a/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt
+++ b/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt
@@ -174,8 +174,6 @@ class FileDetailsFragment : RxFragment() {
                 screenshotTitleScrimView.visibility = View.GONE
             }
 
-            var lastDownloadStatus: FileDownload.Status? = null
-
             val accessedView: TextView = findViewById(R.id.filedetails_accessed)
             if (file.isAccessed) {
                 val accessed = PutioUtils.parseIsoTime(activity, file.firstAccessedAt)
@@ -213,7 +211,17 @@ class FileDetailsFragment : RxFragment() {
                 playMorePopup.show()
             }
             val playOriginalItem = playMorePopup.menu.add(R.string.stream_original).setOnMenuItemClickListener {
-                play(false, lastDownloadStatus == FileDownload.Status.Downloaded)
+                Single.fromCallable {
+                    fileDownloads.getByFileIdSynchronous(file.id)!!
+                }.subscribeOn(Schedulers.io())
+                        .bindToLifecycle(this@FileDetailsFragment)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe({ fileDownload ->
+                            play(false, fileDownload.status == FileDownload.Status.Downloaded
+                                    && fileDownload.downloadedMp4 != true)
+                        }, { error ->
+                            PutioUtils.getRxJavaThrowable(error).printStackTrace()
+                        })
                 true
             }
 
@@ -266,6 +274,7 @@ class FileDetailsFragment : RxFragment() {
                     null, FileDownload.Status.NotDownloaded, null, null))
             val downloadStatus = fileDownload
                     .map { it.status }
+            var lastDownloadStatus: FileDownload.Status? = null
             var lastMp4PercentDone = 0
 
             data class DownloadAndMp4Status(
diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt
deleted file mode 100644
index 71c63d69..00000000
--- a/app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.stevenschoen.putionew.files
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.view.View
-import android.widget.TextView
-import com.stevenschoen.putionew.R
-
-class FileFinishedActivity : AppCompatActivity() {
-
-    companion object {
-        const val EXTRA_NAME = "name"
-        const val EXTRA_URI = "uri"
-        const val EXTRA_MEDIA_TYPE = "type"
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_filefinished)
-
-        val name = intent.extras.getString(EXTRA_NAME)
-
-        val messageView = findViewById<TextView>(R.id.text_downloadfinished_body)
-        messageView.text = String.format(getString(R.string.downloadfinishedbody), name)
-
-        val openView = findViewById<View>(R.id.button_filefinished_action)
-        openView.setOnClickListener {
-            val uri = intent.extras.getParcelable<Uri>(EXTRA_URI)
-            val type = intent.extras.getString(EXTRA_MEDIA_TYPE)
-            val intent = Intent(Intent.ACTION_VIEW).apply {
-                setDataAndType(uri, type)
-            }
-            startActivity(Intent.createChooser(intent, null))
-
-            finish()
-        }
-
-        val okView = findViewById<View>(R.id.button_filefinished_ok)
-        okView.setOnClickListener { finish() }
-    }
-}
\ No newline at end of file