diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java
index 3db1af77..2c337c63 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java
@@ -298,10 +298,13 @@ public class LinkResolverActivity extends AppCompatActivity {
return;
}
- if (mSharedPreferences.getBoolean(SharedPreferencesUtils.OPEN_LINK_IN_APP, false)) {
+ int linkHandler = Integer.parseInt(mSharedPreferences.getString(SharedPreferencesUtils.LINK_HANDLER, "0"));
+ if (linkHandler == 0) {
+ openInBrowser(uri, pm, true);
+ } else if (linkHandler == 1) {
openInCustomTabs(uri, pm, true);
} else {
- openInBrowser(uri, pm, true);
+ openInWebView(uri);
}
}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AdvancedPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AdvancedPreferenceFragment.java
index f133863d..45661b85 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AdvancedPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/AdvancedPreferenceFragment.java
@@ -1,5 +1,8 @@
package ml.docilealligator.infinityforreddit.settings;
+import static android.app.Activity.RESULT_OK;
+import static android.content.Intent.ACTION_OPEN_DOCUMENT_TREE;
+
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -39,9 +42,6 @@ import ml.docilealligator.infinityforreddit.asynctasks.RestoreSettings;
import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
-import static android.app.Activity.RESULT_OK;
-import static android.content.Intent.ACTION_OPEN_DOCUMENT_TREE;
-
/**
* A simple {@link Fragment} subclass.
*/
@@ -230,6 +230,8 @@ public class AdvancedPreferenceFragment extends PreferenceFragmentCompat {
editor.remove(SharedPreferencesUtils.NSFW_KEY_LEGACY);
editor.remove(SharedPreferencesUtils.BLUR_NSFW_KEY_LEGACY);
editor.remove(SharedPreferencesUtils.BLUR_SPOILER_KEY_LEGACY);
+ editor.remove(SharedPreferencesUtils.CONFIRM_TO_EXIT_LEGACY);
+ editor.remove(SharedPreferencesUtils.OPEN_LINK_IN_APP_LEGACY);
SharedPreferences.Editor sortTypeEditor = mSortTypeSharedPreferences.edit();
sortTypeEditor.remove(SharedPreferencesUtils.SORT_TYPE_ALL_POST_LEGACY);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
index 9e3f8c69..6235c3c6 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
@@ -93,7 +93,7 @@ public class SharedPreferencesUtils {
public static final String VOLUME_KEYS_NAVIGATE_COMMENTS = "volume_keys_navigate_comments";
public static final String VOLUME_KEYS_NAVIGATE_POSTS = "volume_keys_navigate_posts";
public static final String MUTE_VIDEO = "mute_video";
- public static final String OPEN_LINK_IN_APP = "open_link_in_app";
+ public static final String LINK_HANDLER = "link_handler";
public static final String VIDEO_AUTOPLAY = "video_autoplay";
public static final String VIDEO_AUTOPLAY_VALUE_ALWAYS_ON = "2";
public static final String VIDEO_AUTOPLAY_VALUE_ON_WIFI = "1";
@@ -363,4 +363,5 @@ public class SharedPreferencesUtils {
public static final String BLUR_NSFW_KEY_LEGACY = "blur_nsfw";
public static final String BLUR_SPOILER_KEY_LEGACY = "blur_spoiler";
public static final String CONFIRM_TO_EXIT_LEGACY = "confirm_to_exit";
+ public static final String OPEN_LINK_IN_APP_LEGACY = "open_link_in_app";
}
diff --git a/app/src/main/res/layout/bottom_app_bar.xml b/app/src/main/res/layout/bottom_app_bar.xml
index fa1d886f..47a35792 100644
--- a/app/src/main/res/layout/bottom_app_bar.xml
+++ b/app/src/main/res/layout/bottom_app_bar.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/bottom_app_bar_bottom_app_bar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="48dp"
android:visibility="gone"
app:fabAlignmentMode="center">
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 10b02874..b9381784 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -311,7 +311,6 @@ Tippen für Neuversuch."
"Gesten & Knöpfe"
"Scrollposition in HOME speichern"
"Neue Beitrage nach dem Aktualisieren von HOME anzeigen (Frontseite, Sortierung: Beste)"
- "Link in App öffnen"
"Video"
"Videos automatisch abspielen"
"Automatisch abgespielte Videos stummschalten"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 58689b60..299018eb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -318,7 +318,6 @@ Premio means prize, so it's better suited the first word instead of the second o
"Gestos y Botones"
"Guardar Posición en INICIO"
"Ver nuevas publicaciones después de actualizar la página de INICIO (Página inicial, ordenar por: Lo mejor)"
- "Abrir enlaces dentro de la App"
"Vídeo"
"Reproducción automática de Vídeo"
"Silenciar Videos reproducidos automáticamente"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 176d913b..6d0b1c80 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -325,7 +325,6 @@ Appuyez pour réessayer."
"Gestes & Boutons"
"Sauvegarder la position défilée dans l'accueil"
"Parcourir les nouveaux messages après actualisation dans l'accueil (Front Page, type de tri : Meilleur)"
- "Ouvrir les lien dans l'application"
"Vidéo"
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 34b7099d..fc9da9ac 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -330,7 +330,6 @@ Behavior -->
"जैस्चर्स एवं बटन्स"
"होम पर स्क्रौल की स्थिति स्थिर करें "
"होम में ताजा करने पर नई पोस्ट्स देखें (मुख पृष्ट, क्रम: श्रेष्ठ)"
- "लिंक एप में खोलें "
"वीडियो "
"वीडियो स्वचालन"
"स्वचालित वीडियोज को मौन करें "
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a4906160..15d71b12 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -279,7 +279,6 @@
"Geste i tipke"
"Spremi poziciju na NASLOVNICA"
"Pregledavaj nove objave nakon osvježivanja u NASLOVNICA (Početna stranica, vrsta sortiranja: Najbolje)"
- "Otvori poveznicu unutar aplikacije"
"Video"
"Automatsko pokretanje videozapisa"
"Automatski pokrenuti videozapisi bez zvuka"
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index b6c9eada..86c67dc7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -287,7 +287,6 @@
"Gesztusok és gombok"
"Görgetés pozíciójának mentése a Kezdőlapon"
"Böngéssz új posztokat a Kezdőlap frissítése után (Kezdőlap, rendezés típusa: Legjobb)"
- "Nyisd meg a linket appon belül"
"Videó"
"Videó autómatikus lejátszása"
"Autómatikusan lejátszó videók némítása"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5324b6ac..354409fa 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -302,7 +302,6 @@ Tocca per riprovare."
"Gesti e pulsanti"
"Salva posizione di scorrimento nella HOME"
"Sfoglia i nuovi post dopo l'aggiornamento in HOME (pagina iniziale, tipo di ordinamento: migliore)"
- "Apri Link nell'App"
"Video"
"Autoriproduzione video"
"Muta video autoriprodotti"
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fefb69b6..4e66254d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -328,7 +328,6 @@
"ジェスチャーとボタン"
"ホーム画面のスクロール位置を保存"
"ホームを更新後は新しい投稿を表示 (フロントページ、並べ替え: ベスト)"
- "リンクをアプリ内で開く"
"動画"
"動画を自動再生"
"自動再生の動画をミュート"
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5f4702bc..51069f53 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -296,7 +296,6 @@ Tik om opnieuw te proberen."
"Gebaren & Knoppen"
"Bewaar de scrollpositie in HOME"
"Blader door nieuwe posts na het vernieuwen in HOME (voorpagina, sorteertype: Beste)"
- "Open Link In App"
"Video"
"Video Automatisch Afspelen"
"Demp Automatisch Afspelende Video's"
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index aff2cfc6..899d49da 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -289,7 +289,6 @@
"Gesty i przyciski"
"Zapisz pozycję na stronie głównej"
"Przeglądaj nowe posty po odświeżeniu strony głównej"
- "Otwórz link w aplikacji"
"Wideo"
"Autoodtwarzanie wideo"
"Wycisz automatycznie odtwarzane wideo"
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1bcc851a..533cdabb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -301,7 +301,6 @@ Toque para tentar novamente."
"Gestos e Botões"
"Posição de rolagem salva na tela inicial"
"Navegue por posts novos depois de atualizar a tela inicial ( Primeira Página, modo de classificação: Melhores)"
- "Abrir Link no App"
"Vídeo"
"Reprodução Automática de Vídeo"
"Silenciar Vídeos Reproduzidos Automaticamente"
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 2aa5d3da..6bac5299 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -299,7 +299,6 @@ Toque para tentar novamente."
"Gestos e Botões"
"Guardar Posição de Deslizamento em INÍCIO"
"Explorar novas publicações após recarregar INÍCIO (Página Principal, ordenado por: Melhor)"
- "Abrir Ligação na Aplicação"
"Vídeo"
"Reprodução Automática de Vídeos"
"Vídeos em auto-reprodução Sem Som"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4975a560..da45323e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -299,7 +299,6 @@
"Жесты и кнопки"
"Сохранять прокрученную позицию на «Главной»"
"Просмотр новых постов после обновления на «Главной» (Заглавная страница, сортировка: лучшее)"
- "Открыть ссылку в приложении"
"Видео"
"Автовоспроизведение видео"
"Отключать звук у автовоспроизводящихся видео"
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 86ecfb0c..8a8684b5 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -300,7 +300,6 @@ Tekrar denemek için tıklayın."
"İşaretler ve Düğmeler"
"Ana Sayfada Kaydırma Konumunu Kaydet"
"Ana Sayfa yenilendikten sonra yeni gönderilere göz atın (Ön Sayfa, sıralama türü: En iyi)"
- "Bağlantıları Uygulamada Aç"
"Video"
"Otomatik Video Oynatma"
"Otomatik Oynatılan Videoları Sessize Al"
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 50815bbc..5d12baaa 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -363,7 +363,6 @@
Жести і кнопки
Зберігати позицію прокрутки в ДОМІВЦІ
Оглядати нові дописи після оновлення ДОМІВКИ (Перша сторінка, тип сортування: Кращі)
- Відкривати посилання в програмі
Відеозаписи
Автовідтворення відео
Глушити автовідтворювані відео
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index c6544cd8..04a938a6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -300,7 +300,6 @@ Nhấn để thử lại."
"Cử chỉ & Nút"
"Giữ vị trí cuộn trong Trang chủ"
"Duyệt các bài viết mới sau khi làm mới trong TRANG CHỦ (Trang chính, loại sắp xếp: Hay nhất)"
- "Mở liên kết trong ứng dụng"
"VIDEO"
"Tự động phát Video"
"Tắt tiếng những Video tự động phát"
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e91f6e33..015ce71b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -293,7 +293,6 @@
"手势和按钮"
"在首页记住浏览的位置"
"刷新首页浏览新帖(排序为精选)"
- "在应用内打开网页"
"视频"
"自动播放视频"
"静音自动播放的视频"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ffe31f93..6f74d814 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -542,4 +542,16 @@
- 200
+
+ - @string/settings_link_handler_value_external_browser
+ - @string/settings_link_handler_value_custom_tab
+ - @string/settings_link_handler_value_internal_browser
+
+
+
+ - 0
+ - 1
+ - 2
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f791a313..042fe4fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -365,7 +365,7 @@
Gestures & Buttons
Save Scrolled Position in HOME
Browse new posts after refreshing in HOME (Front Page, sort type: Best)
- Open Link In App
+ Link Handler
Video
Video Autoplay
Mute Autoplaying Videos
@@ -610,6 +610,9 @@
App Lock Timeout
Enable folding phone support
Default Playback Speed
+ External Browser
+ Custom Tab
+ Internal Browser
Cannot get the link
@@ -1148,7 +1151,7 @@
Exclude this user
Exclude this flair
Contain this flair
- Exclude Domain
+ Exclude this domain
Suggest Title
Failed to suggest a title
diff --git a/app/src/main/res/xml/miscellaneous_preferences.xml b/app/src/main/res/xml/miscellaneous_preferences.xml
index 67a78aca..990513a0 100644
--- a/app/src/main/res/xml/miscellaneous_preferences.xml
+++ b/app/src/main/res/xml/miscellaneous_preferences.xml
@@ -7,11 +7,14 @@
app:title="@string/settings_save_front_page_scrolled_position_title"
app:summary="@string/settings_save_front_page_scrolled_position_summary" />
-
+ app:key="link_handler"
+ app:title="@string/settings_link_handler_title"
+ app:useSimpleSummaryProvider="true" />