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

Follow some Expo 43 -> 44 template-app changes, belatedly #5550

Merged
merged 2 commits into from
Nov 19, 2022
Merged

Follow some Expo 43 -> 44 template-app changes, belatedly #5550

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
317744e
android: Override MainActivity.invokeDefaultOnBackPressed, following …
chrisbobbe Nov 11, 2022
3fa18f3
ios: Follow Expo 44 in calling a super method in AppDelegate for Linking
chrisbobbe Nov 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions android/app/src/main/java/com/zulipmobile/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.zulipmobile

import android.os.Build
import android.content.Intent
import android.os.Bundle
import android.webkit.WebView
Expand Down Expand Up @@ -91,4 +92,23 @@ open class MainActivity : ReactActivity() {
}
super.onNewIntent(intent)
}

/**
* Align the back button behavior with Android S
* where moving root activities to background instead of finishing activities.
* @see <a href="https://developer.android.com/reference/android/app/Activity#onBackPressed()">onBackPressed</a>
*/
override fun invokeDefaultOnBackPressed() {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
if (!moveTaskToBack(false)) {
// For non-root activities, use the default implementation to finish them.
super.invokeDefaultOnBackPressed()
}
return
}

// Use the default back button implementation on Android S
// because it's doing more than {@link Activity#moveTaskToBack} in fact.
super.invokeDefaultOnBackPressed()
}
}
2 changes: 1 addition & 1 deletion ios/ZulipMobile/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ - (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
{
return [RCTLinkingManager application:application openURL:url options:options];
return [super application:application openURL:url options:options] || [RCTLinkingManager application:application openURL:url options:options];
}

// Required to register for notifications
Expand Down