From 7e69c3a354f9b172017037c62d638735e97a6de5 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 3 Jun 2014 10:54:48 +0200
Subject: [PATCH] Preferences code cleanup.

---
 .../syncthingandroid/gui/SettingsActivity.java    | 15 ---------------
 src/main/res/xml/settings.xml                     |  9 ++++++---
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java
index ffb92b19..f0d4ba3a 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java
@@ -26,8 +26,6 @@ import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;
 public class SettingsActivity extends PreferenceActivity
 		implements Preference.OnPreferenceChangeListener {
 
-	private static final String REPORT_ISSUE_KEY = "report_issue";
-
 	private static final String SYNCTHING_OPTIONS_KEY = "syncthing_options";
 
 	private static final String SYNCTHING_GUI_KEY = "syncthing_gui";
@@ -122,19 +120,6 @@ public class SettingsActivity extends PreferenceActivity
 		unbindService(mSyncthingServiceConnection);
 	}
 
-	/**
-	 * Opens issue tracker when that preference is clicked.
-	 */
-	@Override
-	public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-										 Preference preference) {
-		if (REPORT_ISSUE_KEY.equals(preference.getKey())) {
-			startActivity(new Intent(Intent.ACTION_VIEW,
-					Uri.parse(getString(R.string.issue_tracker_url))));
-		}
-		return super.onPreferenceTreeClick(preferenceScreen, preference);
-	}
-
 	/**
 	 * Handles ActionBar back selected.
 	 */
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 0d005605..d7485598 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -79,9 +79,12 @@
 	</PreferenceScreen>
 
 	<Preference
-		android:key="report_issue"
-		android:title="@string/report_issue_title"
-		android:summary="@string/report_issue_summary"/>
+			android:title="@string/report_issue_title"
+			android:summary="@string/report_issue_summary" >
+		<intent
+				android:action="android.intent.action.VIEW"
+				android:data="@string/issue_tracker_url" />
+	</Preference>
 
 	<Preference
 		android:key="syncthing_version"