Code improvements here and there

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -786,11 +786,9 @@ public class DownloadDialog extends DialogFragment
 
                 if (format == MediaFormat.TTML) {
                     filenameTmp += MediaFormat.SRT.suffix;
-                } else {
-                    if (format != null) {
+                } else if (format != null) {
                     filenameTmp += format.suffix;
                 }
-                }
                 break;
             default:
                 throw new RuntimeException("No stream selected");

app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java

@@ -35,7 +35,10 @@ public class SecondaryStreamHelper<T extends Stream> {
     public static AudioStream getAudioStreamFor(@NonNull final List<AudioStream> audioStreams,
                                                 @NonNull final VideoStream videoStream) {
         final MediaFormat mediaFormat = videoStream.getFormat();
-        if (mediaFormat != null) {
+        if (mediaFormat == null) {
+            return null;
+        }
+
         switch (mediaFormat) {
             case WEBM:
             case MPEG_4:// ¿is mpeg-4 DASH?
@@ -63,7 +66,6 @@ public class SecondaryStreamHelper<T extends Stream> {
                 return audio;
             }
         }
-        }
 
         return null;
     }

app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java

@@ -155,10 +155,10 @@ public class StreamItemAdapter<T extends Stream, U extends Stream> extends BaseA
                 qualityString += " (" + context.getString(R.string.caption_auto_generated) + ")";
             }
         } else {
-            if (mediaFormat != null) {
-                qualityString = mediaFormat.getSuffix();
-            } else {
+            if (mediaFormat == null) {
                 qualityString = context.getString(R.string.unknown_quality);
+            } else {
+                qualityString = mediaFormat.getSuffix();
             }
         }