summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-11-21 21:34:14 +0300
committerAndrew Dolgov <[email protected]>2017-11-21 21:34:14 +0300
commitbf5528dd5e245276af373b615d35c1f18b98f769 (patch)
tree87021cf71796214da7a7f3a17a9ed58f40446280 /org.fox.ttrss/src
parentf7faa758d0dd228642e4aa2459184cd2a5c2029e (diff)
never try to pass null package name to bindCustomTabsService
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java6
1 files changed, 5 insertions, 1 deletions
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;