mirror of
https://github.com/TeamNewPipe/NewPipe.git
synced 2025-10-04 02:09:41 +02:00
resolve conflict
This commit is contained in:
commit
849a45a3ca
23 changed files with 1081 additions and 322 deletions
|
@ -10,6 +10,7 @@ import android.view.MenuInflater;
|
|||
import android.view.MenuItem;
|
||||
|
||||
import org.schabi.newpipe.settings.SettingsActivity;
|
||||
import org.schabi.newpipe.util.PermissionHelper;
|
||||
|
||||
/**
|
||||
* Created by Christian Schabesberger on 02.08.16.
|
||||
|
@ -72,6 +73,9 @@ public class MainActivity extends ThemableActivity {
|
|||
return true;
|
||||
}
|
||||
case R.id.action_show_downloads: {
|
||||
if(!PermissionHelper.checkStoragePermissions(this)) {
|
||||
return false;
|
||||
}
|
||||
Intent intent = new Intent(this, org.schabi.newpipe.download.DownloadActivity.class);
|
||||
startActivity(intent);
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue