Merge pull request #9822 from nextcloud/chore/conflicts-dialog-logs

ConflictsResolveActivity: Add log messages when dialog can't be created

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

@@ -17,7 +17,6 @@
 
 package com.owncloud.android.ui.activity;
 
-import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -201,9 +200,11 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
 
                         startDialog();
                     } else {
+                        Log_OC.e(TAG, "ReadFileRemoteOp returned failure with code: " + result.getHttpCode());
                         showErrorAndFinish();
                     }
                 } catch (Exception e) {
+                    Log_OC.e(TAG, "Error when trying to fetch remote file", e);
                     showErrorAndFinish();
                 }
 
@@ -218,6 +219,7 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
         Optional<User> userOptional = getUser();
 
         if (!userOptional.isPresent()) {
+            Log_OC.e(TAG, "User not present");
             showErrorAndFinish();
         }
 
@@ -236,6 +238,7 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
             dialog.show(fragmentTransaction, "conflictDialog");
         } else {
             // Account was changed to a different one - just finish
+            Log_OC.e(TAG, "Account was changed, finishing");
             showErrorAndFinish();
         }
     }