diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java index b33745c45..c43b58595 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java @@ -678,9 +678,7 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit // If the account isn't loaded yet, eat the input. return false; } - Uri uri = Uri.parse(loadedAccount.url); - Intent intent = new Intent(Intent.ACTION_VIEW, uri); - startActivity(intent); + LinkHelper.openLink(loadedAccount.url, this); return true; } case R.id.action_follow: { diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java b/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java index 231ec5745..55545509a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java @@ -15,7 +15,8 @@ package com.keylesspalace.tusky; -import android.content.res.Configuration; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; @@ -26,6 +27,7 @@ import android.view.Menu; import android.view.MenuItem; import com.keylesspalace.tusky.fragment.ViewThreadFragment; +import com.keylesspalace.tusky.util.LinkHelper; public class ViewThreadActivity extends BaseActivity { @Override @@ -35,11 +37,11 @@ public class ViewThreadActivity extends BaseActivity { Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - ActionBar bar = getSupportActionBar(); - if (bar != null) { - bar.setTitle(null); - bar.setDisplayHomeAsUpEnabled(true); - bar.setDisplayShowHomeEnabled(true); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setTitle(R.string.title_view_thread); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); } String id = getIntent().getStringExtra("id"); @@ -62,14 +64,11 @@ public class ViewThreadActivity extends BaseActivity { onBackPressed(); return true; } + case R.id.action_open_in_web: { + LinkHelper.openLink(getIntent().getStringExtra("url"), this); + return true; + } } return super.onOptionsItemSelected(item); } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - /* Provide a stub to ignore configuration changes so the thread isn't reloaded when the - * the activity is reoriented or resized. */ - } } diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Status.java b/app/src/main/java/com/keylesspalace/tusky/entity/Status.java index 7d28ea9da..3c1c36290 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Status.java +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Status.java @@ -27,8 +27,6 @@ import java.util.Date; import java.util.List; public class Status { - private Status actionableStatus; - public String url; @SerializedName("reblogs_count") diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java index 6b532ca02..2c86c4fd0 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java @@ -294,7 +294,8 @@ public abstract class SFragment extends BaseFragment implements AdapterItemRemov protected void viewThread(Status status) { Intent intent = new Intent(getContext(), ViewThreadActivity.class); - intent.putExtra("id", status.getActionableId()); + intent.putExtra("id", status.id); + intent.putExtra("url", status.url); startActivity(intent); } diff --git a/app/src/main/res/layout/fragment_view_thread.xml b/app/src/main/res/layout/fragment_view_thread.xml index 3616a48f6..03119b4fc 100644 --- a/app/src/main/res/layout/fragment_view_thread.xml +++ b/app/src/main/res/layout/fragment_view_thread.xml @@ -1,11 +1,10 @@ - + + + \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 262d9137c..21189ae40 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -23,7 +23,7 @@ الاشعارات المحلية الفدرالية - الخيط + الخيط #%s المشاركات المتابَعون diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5a4509eb8..a0065f347 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -23,7 +23,7 @@ Benachrichtigungen Lokal Föderiert - Unterhaltung + Unterhaltung #%s Beiträge Folgt @@ -199,7 +199,7 @@ Link kopieren %1$s heruntergeladen Willst du diesem Account wirklich nicht mehr folgen? - NSFW_Inhalte immer anzeigen + NSFW-Inhalte immer anzeigen Geteilte Beiträge Benachrichtigungen wenn deine Beiträge geteilt werden Benachrichtigungen wenn deine Beiträge favorisiert werden @@ -209,5 +209,4 @@ Benachrichtigungen über neue Erwänungen Neue Erwähnungen - diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b3b3785b0..7ecd1a3bf 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -22,7 +22,7 @@ Notifications Local Fédéré - Fil + Fil #%s Pouets Abonnements diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0ac348c09..7faa27f75 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -22,7 +22,7 @@ 通知 ローカル 連合 - スレッド + スレッド #%s 投稿 フォロー diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eb1bb0c97..0cdd8db1e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -21,7 +21,7 @@ Meldingen Lokale tijdlijn Globale tijdlijn - Conversatie + Conversatie #%s Toots Volgt diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 75b768960..87f89247e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -22,7 +22,7 @@ Powiadomienia Lokalne Federalne - Wątek + Wątek #%s Posty Obserwacje diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 255deb536..4c2140684 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -22,7 +22,7 @@ Notificações Local Global - Sequência + Sequência #%s Postagens Segue diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 958c8fa7b..3657b124c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -22,7 +22,7 @@ Уведомления Локальная лента Глобальная лента - Тред + Тред #%s Посты Подписки diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index dbd2973f2..c00b38912 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -23,7 +23,7 @@ Bildirimler Yerel Birleşmiş - Dizi + Dizi #%s İletiler Takip edilenler diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9e6476008..2e0e57909 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,7 +22,7 @@ Notifications Local Federated - Thread + Toot #%s Posts Follows @@ -233,5 +233,4 @@ Follows you Always show all nsfw content -