Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-21 15:44:14 +01:00
parent c60d98e52d e4aa69b8d3
commit 647cfcd401
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
View File

@ -141,6 +141,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl); outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService); outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false); outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
@ -148,6 +149,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item);
int id = item.getItemId(); int id = item.getItemId();
if (id == android.R.id.home) { if (id == android.R.id.home) {
// This ID represents the Home or Up button. In the case of this // This ID represents the Home or Up button. In the case of this

7
app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
View File

@ -647,8 +647,8 @@ public class VideoItemDetailFragment extends Fragment {
} }
@Override @Override
public void onActivityCreated(Bundle savedInstanceBundle) { public void onStart() {
super.onActivityCreated(savedInstanceBundle); super.onStart();
Activity a = getActivity(); Activity a = getActivity();
infoItemBuilder = new InfoItemBuilder(a, a.findViewById(android.R.id.content)); infoItemBuilder = new InfoItemBuilder(a, a.findViewById(android.R.id.content));
@ -779,11 +779,13 @@ public class VideoItemDetailFragment extends Fragment {
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
actionBarHandler.setupMenu(menu, inflater); actionBarHandler.setupMenu(menu, inflater);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item);
return actionBarHandler.onItemSelected(item); return actionBarHandler.onItemSelected(item);
} }
@ -806,6 +808,7 @@ public class VideoItemDetailFragment extends Fragment {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { switch (requestCode) {
case RECAPTCHA_REQUEST: case RECAPTCHA_REQUEST:
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {