diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-16 11:17:24 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-16 11:17:24 +0100 |
| commit | d0a89de65af013b61a07166fdccea5206ba26d5f (patch) | |
| tree | cdea201e490fb4692f12773f29c40ed8311044bd /main/src | |
| parent | 78b6470ef8f2831698676cf2a530d1ef18526002 (diff) | |
| download | cgeo-d0a89de65af013b61a07166fdccea5206ba26d5f.zip cgeo-d0a89de65af013b61a07166fdccea5206ba26d5f.tar.gz cgeo-d0a89de65af013b61a07166fdccea5206ba26d5f.tar.bz2 | |
Refactoring: remove double initialization
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/SettingsActivity.java | 10 |
1 files changed, 3 insertions, 7 deletions
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); |
