make share with newpipe part of newpipe
This commit is contained in:
parent
6e523d37ba
commit
e99e944ac3
|
@ -76,6 +76,11 @@
|
||||||
<data android:scheme="vnd.youtube" />
|
<data android:scheme="vnd.youtube" />
|
||||||
<data android:scheme="vnd.youtube.launch" />
|
<data android:scheme="vnd.youtube.launch" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.SEND" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<data android:mimeType="text/plain" />
|
||||||
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".player.PlayVideoActivity"
|
android:name=".player.PlayVideoActivity"
|
||||||
|
|
|
@ -17,6 +17,9 @@ import org.schabi.newpipe.R;
|
||||||
import org.schabi.newpipe.extractor.NewPipe;
|
import org.schabi.newpipe.extractor.NewPipe;
|
||||||
import org.schabi.newpipe.extractor.StreamingService;
|
import org.schabi.newpipe.extractor.StreamingService;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.HashSet;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
|
||||||
|
@ -38,6 +41,13 @@ import org.schabi.newpipe.extractor.StreamingService;
|
||||||
|
|
||||||
public class VideoItemDetailActivity extends AppCompatActivity {
|
public class VideoItemDetailActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes invisible separators (\p{Z}) and punctuation characters including
|
||||||
|
* brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
|
||||||
|
* more details.
|
||||||
|
*/
|
||||||
|
private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
|
||||||
|
|
||||||
private static final String TAG = VideoItemDetailActivity.class.toString();
|
private static final String TAG = VideoItemDetailActivity.class.toString();
|
||||||
|
|
||||||
private VideoItemDetailFragment fragment;
|
private VideoItemDetailFragment fragment;
|
||||||
|
@ -86,39 +96,31 @@ public class VideoItemDetailActivity extends AppCompatActivity {
|
||||||
|
|
||||||
private void handleIntent(Intent intent) {
|
private void handleIntent(Intent intent) {
|
||||||
Bundle arguments = new Bundle();
|
Bundle arguments = new Bundle();
|
||||||
// this means the video was called though another app
|
boolean autoplay = false;
|
||||||
if (intent.getData() != null) {
|
if (intent.getData() != null) {
|
||||||
|
// this means the video was called though another app
|
||||||
videoUrl = intent.getData().toString();
|
videoUrl = intent.getData().toString();
|
||||||
StreamingService[] serviceList = NewPipe.getServices();
|
currentStreamingService = getServiceIdByUrl(videoUrl);
|
||||||
//StreamExtractor videoExtractor = null;
|
|
||||||
for (int i = 0; i < serviceList.length; i++) {
|
|
||||||
if (serviceList[i].getUrlIdHandlerInstance().acceptUrl(videoUrl)) {
|
|
||||||
arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
|
|
||||||
currentStreamingService = i;
|
|
||||||
//videoExtractor = ServiceList.getService(i).getExtractorInstance();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(currentStreamingService == -1) {
|
if(currentStreamingService == -1) {
|
||||||
Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
|
Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
|
||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
//arguments.putString(VideoItemDetailFragment.VIDEO_URL,
|
autoplay = PreferenceManager.getDefaultSharedPreferences(this)
|
||||||
// videoExtractor.getUrl(videoExtractor.getId(videoUrl)));//cleans URL
|
.getBoolean(getString(R.string.autoplay_through_intent_key), false);
|
||||||
arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
|
} else if(intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
|
||||||
|
//this means that vidoe was called through share menu
|
||||||
arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
|
String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
|
||||||
PreferenceManager.getDefaultSharedPreferences(this)
|
videoUrl = getUris(extraText)[0];
|
||||||
.getBoolean(getString(R.string.autoplay_through_intent_key), false));
|
currentStreamingService = getServiceIdByUrl(videoUrl);
|
||||||
} else {
|
} else {
|
||||||
|
//this is if the video was called through another NewPipe activity
|
||||||
videoUrl = intent.getStringExtra(VideoItemDetailFragment.VIDEO_URL);
|
videoUrl = intent.getStringExtra(VideoItemDetailFragment.VIDEO_URL);
|
||||||
currentStreamingService = intent.getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
|
currentStreamingService = intent.getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
|
||||||
arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
|
|
||||||
arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
|
|
||||||
arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
|
|
||||||
}
|
}
|
||||||
|
arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, autoplay);
|
||||||
|
arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
|
||||||
|
arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
|
||||||
addFragment(arguments);
|
addFragment(arguments);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addFragment(final Bundle arguments) {
|
private void addFragment(final Bundle arguments) {
|
||||||
|
@ -171,4 +173,70 @@ public class VideoItemDetailActivity extends AppCompatActivity {
|
||||||
fragment.onCreateOptionsMenu(menu, getMenuInflater());
|
fragment.onCreateOptionsMenu(menu, getMenuInflater());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves all Strings which look remotely like URLs from a text.
|
||||||
|
* Used if NewPipe was called through share menu.
|
||||||
|
*
|
||||||
|
* @param sharedText text to scan for URLs.
|
||||||
|
* @return potential URLs
|
||||||
|
*/
|
||||||
|
private String[] getUris(final String sharedText) {
|
||||||
|
final Collection<String> result = new HashSet<>();
|
||||||
|
if (sharedText != null) {
|
||||||
|
final String[] array = sharedText.split("\\p{Space}");
|
||||||
|
for (String s : array) {
|
||||||
|
s = trim(s);
|
||||||
|
if (s.length() != 0) {
|
||||||
|
if (s.matches(".+://.+")) {
|
||||||
|
result.add(removeHeadingGibberish(s));
|
||||||
|
} else if (s.matches(".+\\..+")) {
|
||||||
|
result.add("http://" + s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result.toArray(new String[result.size()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String removeHeadingGibberish(final String input) {
|
||||||
|
int start = 0;
|
||||||
|
for (int i = input.indexOf("://") - 1; i >= 0; i--) {
|
||||||
|
if (!input.substring(i, i + 1).matches("\\p{L}")) {
|
||||||
|
start = i + 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return input.substring(start, input.length());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String trim(final String input) {
|
||||||
|
if (input == null || input.length() < 1) {
|
||||||
|
return input;
|
||||||
|
} else {
|
||||||
|
String output = input;
|
||||||
|
while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
|
||||||
|
output = output.substring(1);
|
||||||
|
}
|
||||||
|
while (output.length() > 0
|
||||||
|
&& output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
|
||||||
|
output = output.substring(0, output.length() - 1);
|
||||||
|
}
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getServiceIdByUrl(String url) {
|
||||||
|
StreamingService[] serviceList = NewPipe.getServices();
|
||||||
|
int service = -1;
|
||||||
|
for (int i = 0; i < serviceList.length; i++) {
|
||||||
|
if (serviceList[i].getUrlIdHandlerInstance().acceptUrl(videoUrl)) {
|
||||||
|
service = i;
|
||||||
|
//videoExtractor = ServiceList.getService(i).getExtractorInstance();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return service;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue