Merge pull request #2427 from ardevd/if_fix

FileDisplayActivity: Replaced duplicate subexpression in if statement with instantVideoUploadEnabled preference.

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -289,7 +289,7 @@ public class FileDisplayActivity extends HookActivity
     private void upgradeNotificationForInstantUpload() {
         // check for Android 6+ if legacy instant upload is activated --> disable + show info
         if (PreferenceManager.instantPictureUploadEnabled(this) ||
-                PreferenceManager.instantPictureUploadEnabled(this)) {
+                PreferenceManager.instantVideoUploadEnabled(this)) {
 
             // remove legacy shared preferences
             SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit();