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-24253] (6_0_X) Bugfix for back button when using Camera with o… #8780

Merged
merged 1 commit into from Jan 23, 2017
Merged

[TIMOB-24253] (6_0_X) Bugfix for back button when using Camera with o… #8780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
View file
Open in desktop
Expand Up @@ -856,7 +856,7 @@ public void onBackPressed()
KrollFunction onBackCallback = (KrollFunction) topWindow.getProperty(TiC.PROPERTY_ON_BACK);
onBackCallback.callAsync(activityProxy.getKrollObject(), new Object[] {});
}
if (!topWindow.hasProperty(TiC.PROPERTY_ON_BACK) && !topWindow.hasListeners(TiC.EVENT_ANDROID_BACK)) {
if (topWindow != null || (!topWindow.hasProperty(TiC.PROPERTY_ON_BACK) && !topWindow.hasListeners(TiC.EVENT_ANDROID_BACK))) {
// there are no parent activities to return to
// override back press to background the activity
// note: 2 since there should always be TiLaunchActivity and TiActivity
Expand Down