From 2d390f66037d2b3cb4081a80b49a0b4a548f6a63 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Mon, 30 Oct 2017 10:48:27 +0100 Subject: [PATCH] change default of chrome custom tabs setting to false --- app/src/main/java/com/keylesspalace/tusky/AccountActivity.java | 3 +-- .../com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java | 2 +- app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java | 2 +- app/src/main/res/xml/preferences.xml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java index c43b5859..268fd28f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.AttrRes; @@ -270,7 +269,7 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit } boolean useCustomTabs = PreferenceManager.getDefaultSharedPreferences(this) - .getBoolean("customTabs", true); + .getBoolean("customTabs", false); LinkHelper.setClickableText(note, account.note, null, useCustomTabs, new LinkListener() { @Override public void onViewTag(String tag) { diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java index 0ce84332..56a203a1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java @@ -143,7 +143,7 @@ class StatusBaseViewHolder extends RecyclerView.ViewHolder { /* Redirect URLSpan's in the status content to the listener for viewing tag pages and * account pages. */ boolean useCustomTabs = - PreferenceManager.getDefaultSharedPreferences(context).getBoolean("customTabs", true); + PreferenceManager.getDefaultSharedPreferences(context).getBoolean("customTabs", false); LinkHelper.setClickableText(this.content, builder, mentions, useCustomTabs, listener); } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java index 33445622..19efce4e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java @@ -132,7 +132,7 @@ public class LinkHelper { Uri uri = Uri.parse(url); boolean useCustomTabs = PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean("customTabs", true); + .getBoolean("customTabs", false); if (useCustomTabs) { openLinkInCustomTab(uri, context); } else { diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 3ceba875..204f9f7e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -27,7 +27,7 @@