Merge pull request #4694 from nextcloud/account-cleanup-conflicts-res…

…olve-activity Remove onAccountSet from ConflictsResolveActivity
nextcloud · Oct 17, 2019 · 9773dc4 · 9773dc4
2 parents ae6cfb3 + 451cec9
commit 9773dc4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -82,8 +82,8 @@ public void conflictDecisionMade(Decision decision) {
     }
 
     @Override
-    protected void onAccountSet(boolean stateWasRecovered) {
-        super.onAccountSet(stateWasRecovered);
+    protected void onStart() {
+        super.onStart();
         if (getAccount() != null) {
             OCFile file = getFile();
             if (getFile() == null) {