minor code clean up

Daniel Gultsch created 3 years ago

Change summary

src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 5 
src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java   | 3 
2 files changed, 5 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -1602,7 +1602,6 @@ public class FileBackend {
         return getVideoDimensions(metadataRetriever);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private Dimensions getPdfDocumentDimensions(final File file) {
         final ParcelFileDescriptor fileDescriptor;
         try {
@@ -1610,7 +1609,7 @@ public class FileBackend {
             if (fileDescriptor == null) {
                 return new Dimensions(0, 0);
             }
-        } catch (FileNotFoundException e) {
+        } catch (final FileNotFoundException e) {
             return new Dimensions(0, 0);
         }
         try {
@@ -1621,7 +1620,7 @@ public class FileBackend {
             page.close();
             pdfRenderer.close();
             return scalePdfDimensions(new Dimensions(height, width));
-        } catch (IOException | SecurityException e) {
+        } catch (final IOException | SecurityException e) {
             Log.d(Config.LOGTAG, "unable to get dimensions for pdf document", e);
             return new Dimensions(0, 0);
         }

src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java

@@ -521,6 +521,9 @@ public class RtpSessionActivity extends XmppActivity
             @StringRes int res;
             final String firstDenied =
                     getFirstDenied(permissionResult.grantResults, permissionResult.permissions);
+            if (firstDenied == null) {
+                return;
+            }
             if (Manifest.permission.RECORD_AUDIO.equals(firstDenied)) {
                 res = R.string.no_microphone_permission;
             } else if (Manifest.permission.CAMERA.equals(firstDenied)) {