Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-25770] Android: requestThumbnailImagesAtTimes() does not work with remote content #9817

Merged
merged 2 commits into from
Feb 14, 2018
Merged

[TIMOB-25770] Android: requestThumbnailImagesAtTimes() does not work with remote content #9817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e897fa
Handle different URI schemes in the ThumbnailRetriver.
ypbnv Feb 12, 2018
9d16c31
Merge branch 'master' into TIMOB-25770
ssjsamir Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions android/modules/media/src/java/ti/modules/titanium/media/TiThumbnailRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.HashMap;

import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.common.Log;
Expand All @@ -17,7 +18,6 @@
import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Handler;
import android.os.Message;
import android.webkit.URLUtil;
Expand Down Expand Up @@ -173,10 +173,10 @@ private int setDataSource(Uri mUri, MediaMetadataRetriever mMediaMetadataRetriev
}
} else {
mUri = TiUIHelper.getRedirectUri(mUri);
if (Build.VERSION.SDK_INT >= 14) {
mMediaMetadataRetriever.setDataSource(TiApplication.getAppRootOrCurrentActivity(), mUri);
if (URLUtil.isNetworkUrl(mUri.toString())) {
mMediaMetadataRetriever.setDataSource(mUri.toString(), new HashMap<String, String>());
} else {
mMediaMetadataRetriever.setDataSource(mUri.toString());
mMediaMetadataRetriever.setDataSource(TiApplication.getAppRootOrCurrentActivity(), mUri);
}
}
} catch (IOException ex) {
Expand Down
13 changes: 5 additions & 8 deletions android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import android.os.Handler;
import android.os.Message;
import android.os.Messenger;
import android.webkit.URLUtil;

// clang-format off
@Kroll.proxy(creatableInModule = MediaModule.class,
Expand Down Expand Up @@ -808,15 +809,11 @@ public void requestThumbnailImagesAtTimes(Object[] times, Object option, KrollFu
cancelAllThumbnailImageRequests();
mTiThumbnailRetriever = new TiThumbnailRetriever();
String url = TiConvert.toString(getProperty(TiC.PROPERTY_URL));
if (url.startsWith("file://")) {
mTiThumbnailRetriever.setUri(
Uri.parse(this.resolveUrl(null, TiConvert.toString(this.getProperty(TiC.PROPERTY_URL)))));
} else {
String path = url.contains(":") ? new TitaniumBlob(url).getNativePath() : resolveUrl(null, url);
Uri uri = Uri.parse(path);
mTiThumbnailRetriever.setUri(uri);
if (!URLUtil.isValidUrl(url)) {
url = resolveUrl(null, url);
}

Uri uri = Uri.parse(url);
mTiThumbnailRetriever.setUri(uri);
mTiThumbnailRetriever.getBitmap(TiConvert.toIntArray(times), TiConvert.toInt(option),
createThumbnailResponseHandler(callback));
}
Expand Down