mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4694 from nextcloud/account-cleanup-conflicts-resolve-activity

Browse source 
Remove onAccountSet from ConflictsResolveActivity
This commit is contained in:
Tobias Kaminsky 2019-10-17 07:48:30 +02:00 committed by GitHub
commit 9773dc43cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
View file

@ -82,8 +82,8 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
} }
@Override @Override
protected void onAccountSet(boolean stateWasRecovered) { protected void onStart() {
super.onAccountSet(stateWasRecovered); super.onStart();
if (getAccount() != null) { if (getAccount() != null) {
OCFile file = getFile(); OCFile file = getFile();
if (getFile() == null) { if (getFile() == null) {