Fix crashes with Cast, network errors, and TVs

DSteve595 · Dec 23, 2016 · b85a2b4 · b85a2b4
1 parent 1de2aef
commit b85a2b4
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId 'com.stevenschoen.putionew'
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 105
-        versionName '4.0.3'
+        versionCode 106
+        versionName '4.0.4'
         multiDexEnabled true
     }
     buildTypes {

diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioActivity.java b/app/src/main/java/com/stevenschoen/putionew/PutioActivity.java
@@ -66,6 +66,7 @@ public void onCreate(Bundle savedInstanceState) {
             Intent tvIntent = new Intent(this, TvActivity.class);
             startActivity(tvIntent);
             finish();
+			return;
         }
 
         PutioApplication application = (PutioApplication) getApplication();

diff --git a/app/src/main/java/com/stevenschoen/putionew/cast/BaseCastActivity.kt b/app/src/main/java/com/stevenschoen/putionew/cast/BaseCastActivity.kt
@@ -2,6 +2,7 @@ package com.stevenschoen.putionew.cast
 
 import android.net.Uri
 import android.support.v7.app.AppCompatActivity
+import android.util.Log
 import android.view.Menu
 import com.google.android.gms.cast.MediaInfo
 import com.google.android.gms.cast.MediaMetadata
@@ -16,6 +17,7 @@ import com.stevenschoen.putionew.R
 import com.stevenschoen.putionew.model.files.PutioFile
 import com.stevenschoen.putionew.model.files.PutioSubtitle
 import org.apache.commons.io.FilenameUtils
+import rx.android.schedulers.AndroidSchedulers
 
 abstract class BaseCastActivity : AppCompatActivity(), PutioApplication.CastCallbacks {
 
@@ -32,15 +34,13 @@ abstract class BaseCastActivity : AppCompatActivity(), PutioApplication.CastCall
     }
 
     override fun load(file: PutioFile, url: String, utils: PutioUtils) {
-        if (castContext == null || castSession == null) {
-            utils.getStreamUrlAndPlay(this, file, url)
-        } else {
+        if (castContext != null && castSession != null && castSession!!.remoteMediaClient != null && castSession!!.isConnected) {
             fun play(subtitles: List<PutioSubtitle>? = null) {
                 val metaData = MediaMetadata(
                         if (file.isVideo)
-                    MediaMetadata.MEDIA_TYPE_MOVIE
-                else
-                    MediaMetadata.MEDIA_TYPE_MUSIC_TRACK)
+                            MediaMetadata.MEDIA_TYPE_MOVIE
+                        else
+                            MediaMetadata.MEDIA_TYPE_MUSIC_TRACK)
                 val title = FilenameUtils.removeExtension(file.name).let {
                     if (it.length <= 18) {
                         it
@@ -80,6 +80,8 @@ abstract class BaseCastActivity : AppCompatActivity(), PutioApplication.CastCall
             } else {
                 play()
             }
+        } else {
+            utils.getStreamUrlAndPlay(this, file, url)
         }
     }
 }
diff --git a/app/src/main/java/com/stevenschoen/putionew/cast/CastOptionsProvider.java b/app/src/main/java/com/stevenschoen/putionew/cast/CastOptionsProvider.java
@@ -14,7 +14,7 @@
 public class CastOptionsProvider implements OptionsProvider {
 
 	public static final String CAST_APPLICATION_ID = "E5977464"; // Styled media receiver
-//    public static final String CAST_APPLICATION_ID = "C18ACC9E";
+//	public static final String CAST_APPLICATION_ID = "C18ACC9E";
 //	public static final String CAST_APPLICATION_ID = "79E32AF2"; // Put.io's
 
 	@Override

diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt
@@ -10,10 +10,7 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.CheckBox
-import android.widget.ImageView
-import android.widget.TextView
+import android.widget.*
 import com.squareup.picasso.Picasso
 import com.stevenschoen.putionew.*
 import com.stevenschoen.putionew.PutioApplication.CastCallbacks
@@ -29,7 +26,7 @@ class FileDetailsFragment : RxFragment() {
         val EXTRA_FILE = "file"
 
         val FRAGTAG_RENAME = "rename"
-        val FRAGTAG_DELETE = "delete";
+        val FRAGTAG_DELETE = "delete"
 
         fun newInstance(context: Context, file: PutioFile): FileDetailsFragment {
             if (file.isFolder) {
@@ -235,7 +232,9 @@ class FileDetailsFragment : RxFragment() {
                         PutioApplication.get(context).putioUtils.restInterface
                                 .renameFile(file.id, newName)
                                 .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe()
+                                .subscribe({ }, { error ->
+                                    Toast.makeText(context, R.string.network_error, Toast.LENGTH_SHORT).show()
+                                })
                     }
                 }
             }

diff --git a/app/src/main/java/com/stevenschoen/putionew/model/files/PutioSubtitle.java b/app/src/main/java/com/stevenschoen/putionew/model/files/PutioSubtitle.java
@@ -28,7 +28,7 @@ public String getSource() {
     }
 
     public String getUrl(String format, long fileId, String tokenWithStuff) {
-        return PutioUtils.baseUrl + "/files/" + fileId + "/subtitles/" + getKey() + tokenWithStuff
+        return PutioUtils.baseUrl + "files/" + fileId + "/subtitles/" + getKey() + tokenWithStuff
                 + "&format=" + format;
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -67,6 +67,7 @@
     <string name="notatorrent">This doesn\'t seem to be a torrent file!</string>
     <string name="couldntgetdownloadlink">There was a problem getting the download link.</string>
     <string name="noactivityfound">No installed apps can open this.</string>
+    <string name="network_error">Network error!</string>
 
     <!-- Other stuff -->
     <string name="account">Account</string>