From bf5528dd5e245276af373b615d35c1f18b98f769 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 21 Nov 2017 21:34:14 +0300 Subject: never try to pass null package name to bindCustomTabsService --- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'org.fox.ttrss') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 11a042e4..6aef10ea 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -130,6 +130,7 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc } else if (packagesSupportingCustomTabs.contains(LOCAL_PACKAGE)) { s_customTabPackageName = LOCAL_PACKAGE; } + return s_customTabPackageName; } @@ -232,7 +233,10 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc m_theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT); } - CustomTabsClient.bindCustomTabsService(this, getCustomTabPackageName(this), m_customTabServiceConnection); + String customTabPackageName = getCustomTabPackageName(this); + + CustomTabsClient.bindCustomTabsService(this, customTabPackageName != null ? + customTabPackageName : "com.android.chrome", m_customTabServiceConnection); /*if (!ImageLoader.getInstance().isInited()) { ImageLoaderConfiguration config; -- cgit v1.2.3