Skip to content

Commit

Permalink
generalization in super class
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyScherzinger committed Jul 22, 2016
1 parent 20d3373 commit 58f8650
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/com/owncloud/android/ui/activity/FileActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import android.support.v4.app.FragmentTransaction;
import android.widget.Toast;

import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AuthenticatorActivity;
Expand Down Expand Up @@ -120,7 +121,8 @@ public abstract class FileActivity extends DrawerActivity

@Override
public void showFiles(boolean onDeviceOnly) {
// must be implemented in Drawer using subclasses
// must be specialized in subclasses
MainApp.showOnlyFilesOnDevice(onDeviceOnly);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ public void allFilesOption() {

@Override
public void showFiles(boolean onDeviceOnly) {
MainApp.showOnlyFilesOnDevice(onDeviceOnly);
super.showFiles(onDeviceOnly);
getListOfFilesFragment().refreshDirectory();
}
}
3 changes: 1 addition & 2 deletions src/com/owncloud/android/ui/activity/UploadListActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import android.view.MenuItem;
import android.widget.Toast;

import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.OCFile;
Expand Down Expand Up @@ -73,7 +72,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme

@Override
public void showFiles(boolean onDeviceOnly) {
MainApp.showOnlyFilesOnDevice(onDeviceOnly);
super.showFiles(onDeviceOnly);
Intent i = new Intent(getApplicationContext(), FileDisplayActivity.class);
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(i);
Expand Down

0 comments on commit 58f8650

Please sign in to comment.