Merge branch 'develop' into 'develop'

Fix data and type being set in the intent to open a file

See merge request !22

app/src/main/java/com/commit451/gitlab/activity/FileActivity.kt

@@ -282,11 +282,12 @@ class FileActivity : BaseActivity() {
         val intent = Intent(Intent.ACTION_VIEW)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        intent.data = Uri.fromFile(file)
         val extension = fileExtension(file.name)
         if (extension != null) {
-            intent.setTypeAndNormalize(MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension))
+            intent.setDataAndType(Uri.fromFile(file), MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension))
+        } else {
+            intent.data = Uri.fromFile(file)
         }
         try {