Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change default of chrome custom tabs setting to false

This commit is contained in:
Conny Duck 2017-10-30 10:48:27 +01:00
parent 93fcd33c48
commit 2d390f6603
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View File

@ -22,7 +22,6 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.AttrRes; import android.support.annotation.AttrRes;
@ -270,7 +269,7 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit
} }
boolean useCustomTabs = PreferenceManager.getDefaultSharedPreferences(this) boolean useCustomTabs = PreferenceManager.getDefaultSharedPreferences(this)
.getBoolean("customTabs", true); .getBoolean("customTabs", false);
LinkHelper.setClickableText(note, account.note, null, useCustomTabs, new LinkListener() { LinkHelper.setClickableText(note, account.note, null, useCustomTabs, new LinkListener() {
@Override @Override
public void onViewTag(String tag) { public void onViewTag(String tag) {

2
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -143,7 +143,7 @@ class StatusBaseViewHolder extends RecyclerView.ViewHolder {
/* Redirect URLSpan's in the status content to the listener for viewing tag pages and /* Redirect URLSpan's in the status content to the listener for viewing tag pages and
* account pages. */ * account pages. */
boolean useCustomTabs = boolean useCustomTabs =
PreferenceManager.getDefaultSharedPreferences(context).getBoolean("customTabs", true); PreferenceManager.getDefaultSharedPreferences(context).getBoolean("customTabs", false);
LinkHelper.setClickableText(this.content, builder, mentions, useCustomTabs, listener); LinkHelper.setClickableText(this.content, builder, mentions, useCustomTabs, listener);
} }

2
app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java
View File

@ -132,7 +132,7 @@ public class LinkHelper {
Uri uri = Uri.parse(url); Uri uri = Uri.parse(url);
boolean useCustomTabs = PreferenceManager.getDefaultSharedPreferences(context) boolean useCustomTabs = PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean("customTabs", true); .getBoolean("customTabs", false);
if (useCustomTabs) { if (useCustomTabs) {
openLinkInCustomTab(uri, context); openLinkInCustomTab(uri, context);
} else { } else {

2
app/src/main/res/xml/preferences.xml
View File

@ -27,7 +27,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_title_browser_settings"> <PreferenceCategory android:title="@string/pref_title_browser_settings">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="false"
android:key="customTabs" android:key="customTabs"
android:title="@string/pref_title_custom_tabs" /> android:title="@string/pref_title_custom_tabs" />
</PreferenceCategory> </PreferenceCategory>