From 05bec6201cd52a1c0d917ddc47bb2410cd1f42f3 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 7 Sep 2019 01:30:18 +0200
Subject: [PATCH] about.xml: Declare link to Twitter in XML.

---
 oeffi/res/xml/about.xml                          | 6 +++++-
 oeffi/src/de/schildbach/oeffi/AboutActivity.java | 6 +-----
 oeffi/src/de/schildbach/oeffi/Constants.java     | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/oeffi/res/xml/about.xml b/oeffi/res/xml/about.xml
index 5b73a8a..03fb901 100644
--- a/oeffi/res/xml/about.xml
+++ b/oeffi/res/xml/about.xml
@@ -41,7 +41,11 @@
         <Preference
             android:key="about_twitter"
             android:summary="\@oeffi"
-            android:title="Twitter" />
+            android:title="Twitter">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://twitter.com/oeffi" />
+        </Preference>
     </PreferenceCategory>
     <PreferenceCategory
         android:key="about_donate"
diff --git a/oeffi/src/de/schildbach/oeffi/AboutActivity.java b/oeffi/src/de/schildbach/oeffi/AboutActivity.java
index 04c04ad..6c6bd89 100644
--- a/oeffi/src/de/schildbach/oeffi/AboutActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/AboutActivity.java
@@ -29,7 +29,6 @@ import android.preference.PreferenceScreen;
 
 public class AboutActivity extends PreferenceActivity {
     private static final String KEY_ABOUT_VERSION = "about_version";
-    private static final String KEY_ABOUT_TWITTER = "about_twitter";
     private static final String KEY_ABOUT_CHANGELOG = "about_changelog";
     private static final String KEY_ABOUT_FAQ = "about_faq";
     private static final String KEY_ABOUT_DONATE_BITCOIN = "about_donate_bitcoin";
@@ -53,10 +52,7 @@ public class AboutActivity extends PreferenceActivity {
     public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen, final Preference preference) {
         final String key = preference.getKey();
 
-        if (KEY_ABOUT_TWITTER.equals(key)) {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.TWITTER_URL)));
-            finish();
-        } else if (KEY_ABOUT_CHANGELOG.equals(key)) {
+        if (KEY_ABOUT_CHANGELOG.equals(key)) {
             final Application application = (Application) getApplication();
             ChangelogDialogBuilder.get(this, Application.versionCode(application), null,
                     Application.versionFlavor(application), 0, null).show();
diff --git a/oeffi/src/de/schildbach/oeffi/Constants.java b/oeffi/src/de/schildbach/oeffi/Constants.java
index c0a4833..34f28d5 100644
--- a/oeffi/src/de/schildbach/oeffi/Constants.java
+++ b/oeffi/src/de/schildbach/oeffi/Constants.java
@@ -33,7 +33,6 @@ public class Constants {
     public static final String PLAN_INDEX_FILENAME = "plans-index.txt";
     public static final String PLAN_STATIONS_FILENAME = "plans-stations.txt";
 
-    public static final String TWITTER_URL = "http://twitter.com/oeffi";
     public static final String MARKET_APP_URL = "market://details?id=%s";
     public static final String GOOGLE_PLAY_APP_URL = "https://play.google.com/store/apps/details?id=%s";
     public static final String BITCOIN_ADDRESS = "1PW21MuBgPnjfUQriwK7TnRADFotEhdysr";