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

refactor(android): media/file APIs to use scoped storage #12143

Merged
merged 16 commits into from
Oct 13, 2020
Merged

refactor(android): media/file APIs to use scoped storage #12143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f6bb5b1
refactor(android): content url and resource file handling
jquick-axway Oct 1, 2020
d77352d
refactor(android): media APIs to use scoped storage
jquick-axway Oct 1, 2020
3518251
refactor(android): removed unsupported "ti.android.enablecoverage"
jquick-axway Oct 1, 2020
1a286b7
refactor(android): rename TitaniumBlob to TiContentFile
jquick-axway Oct 1, 2020
577cdf5
Merge branch 'master' into TIMOB-28059
jquick-axway Oct 1, 2020
000a350
Merge branch 'master' into TIMOB-28059
garymathews Oct 2, 2020
b032fd4
Merge branch 'master' into TIMOB-28059
ssaddique Oct 7, 2020
94a8916
Merge branch 'master' into TIMOB-28059
ssaddique Oct 8, 2020
0182810
Merge branch 'master' into TIMOB-28059
jquick-axway Oct 8, 2020
de7b54e
Merge branch 'master' into TIMOB-28059
ssaddique Oct 9, 2020
b8e5f15
chore(android): media capture improvements for TIMOB-28059
jquick-axway Oct 10, 2020
5d0a7b4
feat(android): add has/requestPhotoGalleryPermissions() support
jquick-axway Oct 10, 2020
89c5a5f
Merged
jquick-axway Oct 10, 2020
6c8023a
Merge branch 'master' into TIMOB-28059
ssaddique Oct 12, 2020
c7f900c
test: fix linting issue in "ti.media.test.js"
jquick-axway Oct 12, 2020
137838d
chore(android): create pictures/movies dir if needed
jquick-axway Oct 12, 2020
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
2 changes: 1 addition & 1 deletion android/modules/filesystem/src/java/ti/modules/titanium/filesystem/FilesystemModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public String getSeparator()
@Kroll.getProperty
public String getLineEnding()
{
return System.getProperty("line.separator");
return System.lineSeparator();
}

@Kroll.method
Expand Down
8 changes: 1 addition & 7 deletions android/modules/media/src/java/android/widget/TiVideoView8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,15 +581,10 @@ public boolean onError(MediaPlayer mp, int framework_err, int impl_err)
if (mMediaController != null) {
mMediaController.hide();
}
if (mp != null) {
mp.release();
}

/* If an error handler has been supplied, use it and finish. */
if (mOnErrorListener != null) {
if (mOnErrorListener.onError(mMediaPlayer, framework_err, impl_err)) {
return true;
}
mOnErrorListener.onError(mMediaPlayer, framework_err, impl_err);
}

return true;
Expand Down Expand Up @@ -694,7 +689,6 @@ public void surfaceDestroyed(SurfaceHolder holder)
public void release(boolean cleartargetstate)
{
if (mMediaPlayer != null) {
mMediaPlayer.reset();
mMediaPlayer.release();
mMediaPlayer = null;
mCurrentState = STATE_IDLE;
Expand Down