be-gay-do-crimes
/
NewPipe
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-03-21 09:44:34 +01:00
parent 03bab57a97 e3baf69533
commit 2473069326
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -138,6 +138,7 @@
<data android:host="www.youtube.com" />
<!-- video prefix -->
<data android:pathPrefix="/v/" />
<data android:pathPrefix="/embed/" />
<data android:pathPrefix="/watch" />
<data android:pathPrefix="/attribution_link" />
<!-- channel prefix -->
@ -195,6 +196,7 @@
<data android:host="www.youtube.com" />
<!-- video prefix -->
<data android:pathPrefix="/v/" />
<data android:pathPrefix="/embed/" />
<data android:pathPrefix="/watch" />
<data android:pathPrefix="/attribution_link" />
<!-- channel prefix -->
@ -238,4 +240,4 @@
</application>
</manifest>
</manifest>

1
app/src/main/java/org/schabi/newpipe/ChannelActivity.java
View File

@ -147,6 +147,7 @@ public class ChannelActivity extends AppCompatActivity {
serviceId = savedInstanceState.getInt(NavStack.SERVICE_ID);
NavStack.getInstance()
.restoreSavedInstanceState(savedInstanceState);
handleIntent(getIntent());
}
}

22
app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
View File

@ -60,6 +60,8 @@ import org.schabi.newpipe.player.popup.PopupViewHolder;
import org.schabi.newpipe.player.popup.StateInterface;
import org.schabi.newpipe.util.NavStack;
import java.io.IOException;
public class PopupVideoPlayer extends Service implements StateInterface {
private static final String TAG = ".PopupVideoPlayer";
private static final boolean DEBUG = false;
@ -818,9 +820,25 @@ public class PopupVideoPlayer extends Service implements StateInterface {
});
}
});
} catch (IOException ie) {
if (DEBUG) ie.printStackTrace();
mainHandler.post(new Runnable() {
@Override
public void run() {
Toast.makeText(PopupVideoPlayer.this, R.string.network_error, Toast.LENGTH_SHORT).show();
}
});
stopSelf();
} catch (Exception e) {
e.printStackTrace();
if (DEBUG) e.printStackTrace();
mainHandler.post(new Runnable() {
@Override
public void run() {
Toast.makeText(PopupVideoPlayer.this, R.string.content_not_available, Toast.LENGTH_SHORT).show();
}
});
stopSelf();
}
}
}
}
}