From d0a89de65af013b61a07166fdccea5206ba26d5f Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 16 Dec 2012 11:17:24 +0100
Subject: Refactoring: remove double initialization

---
 main/src/cgeo/geocaching/SettingsActivity.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'main/src/cgeo/geocaching/SettingsActivity.java')

diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index 2acdf82..d40d0f5 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -1002,14 +1002,10 @@ public class SettingsActivity extends AbstractActivity {
         if (resultCode != RESULT_OK) {
             return;
         }
-        String directory = null;
         // we may come back from either our selfmade chooser or from the Open Intent manager
-        if (data.hasExtra(SimpleDirChooser.EXTRA_CHOSEN_DIR)) {
-            directory = data.getStringExtra(SimpleDirChooser.EXTRA_CHOSEN_DIR);
-        }
-        else {
-            directory = new File(data.getData().getPath()).getAbsolutePath();
-        }
+        final String directory = data.hasExtra(SimpleDirChooser.EXTRA_CHOSEN_DIR) ?
+                data.getStringExtra(SimpleDirChooser.EXTRA_CHOSEN_DIR) :
+                new File(data.getData().getPath()).getAbsolutePath();
         if (StringUtils.isNotBlank(directory)) {
             runnableSetDir.run(directory);
             EditText directoryText = (EditText) findViewById(textField);
-- 
cgit v1.1