Add check for when media type cannot be determined

Changes #68
MythTV-Clients · Jan 21, 2017 · 5eaa912 · 5eaa912
1 parent f01333b
commit 5eaa912
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/app/src/main/java/org/mythtv/android/domain/MediaItem.java b/app/src/main/java/org/mythtv/android/domain/MediaItem.java
@@ -405,7 +405,7 @@ public List<Error> getValidationErrors() {
 
     public boolean isValid() {
 
-        return validationErrors.isEmpty();
+        return null == media || validationErrors.isEmpty();
     }
 
     @Override

diff --git a/app/src/main/java/org/mythtv/android/presentation/model/MediaItemModel.java b/app/src/main/java/org/mythtv/android/presentation/model/MediaItemModel.java
@@ -457,7 +457,7 @@ public void setValidationErrors( ArrayList<ErrorModel> validationErrors ) {
 
     public boolean isValid() {
 
-        return validationErrors.isEmpty();
+        return null == media || validationErrors.isEmpty();
     }
 
     @Override

diff --git a/...in/java/org/mythtv/android/presentation/view/activity/phone/MediaItemDetailsActivity.java b/...in/java/org/mythtv/android/presentation/view/activity/phone/MediaItemDetailsActivity.java
@@ -248,6 +248,12 @@ public void onMediaItemLoaded( final MediaItemModel mediaItemModel ) {
     private void loadBackdrop() {
         Log.d( TAG, "loadBackdrop : enter" );
 
+        if( null == mediaItemModel.getMedia() ) {
+            Log.d( TAG, "loadBackdrop : exit, media not set" );
+
+            return;
+        }
+
         String backdropUrl = null;
         switch( mediaItemModel.getMedia() ) {
 

diff --git a/.../main/java/org/mythtv/android/presentation/view/fragment/phone/MediaItemListFragment.java b/.../main/java/org/mythtv/android/presentation/view/fragment/phone/MediaItemListFragment.java
@@ -501,20 +501,29 @@ private void loadMediaItemList() {
             } else {
                 Log.w( TAG, "onItemClicked : data error - mediaItemModel=" + mediaItemModel.toString() );
 
-                String fields = "";
-                for( ErrorModel errorModel : mediaItemModel.getValidationErrors() ) {
+                if( null == mediaItemModel.getMedia() ) {
+
+                    String message = "Media Type could not be determined";
+                    showToastMessage( message, null, null );
+
+                } else {
+
+                    String fields = "";
+                    for( ErrorModel errorModel : mediaItemModel.getValidationErrors() ) {
+
+                        if( !"".equals( fields ) ) {
+                            fields += ", ";
+                        }
+
+                        fields += errorModel.getField();
 
-                    if( !"".equals( fields ) ) {
-                        fields += ", ";
                     }
 
-                    fields += errorModel.getField();
+                    String message = "Thus episode has corrupt data: " + fields;
+                    showToastMessage( message, null, null );
 
                 }
 
-                String message = "Thus episode has corrupt data: " + fields;
-                showToastMessage( message, null, null );
-
             }
 
         }