From 7ff0da0b521971fabb12881bd8112f2de245dfd6 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 6 Mar 2013 06:26:04 +0100
Subject: [PATCH] Refactor code to start Accounts activity to import settings

---
 src/com/fsck/k9/activity/Accounts.java             | 11 +++++++++--
 src/com/fsck/k9/activity/setup/WelcomeMessage.java |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index c6e092fa0..cf54ca370 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -326,7 +326,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
     private static String SELECTED_CONTEXT_ACCOUNT = "selectedContextAccount";
 
     public static final String EXTRA_STARTUP = "startup";
-    public static final String EXTRA_IMPORTFIRST = "importfirst";
+
+    public static final String ACTION_IMPORT_SETTINGS = "importSettings";
 
 
     public static void listAccounts(Context context) {
@@ -337,6 +338,12 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
         context.startActivity(intent);
     }
 
+    public static void importSettings(Context context) {
+        Intent intent = new Intent(context, Accounts.class);
+        intent.setAction(ACTION_IMPORT_SETTINGS);
+        context.startActivity(intent);
+    }
+
     @Override
     public void onNewIntent(Intent intent) {
         Uri uri = intent.getData();
@@ -366,7 +373,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
         //onNewIntent(intent);
 
         // see if we should show the welcome message
-        if (intent.getBooleanExtra(EXTRA_IMPORTFIRST, false)) {
+        if (ACTION_IMPORT_SETTINGS.equals(intent.getAction())) {
             onImport();
         } else if (accounts.length < 1) {
             WelcomeMessage.showWelcomeMessage(this);
diff --git a/src/com/fsck/k9/activity/setup/WelcomeMessage.java b/src/com/fsck/k9/activity/setup/WelcomeMessage.java
index eb4d4413f..9c30bb0c2 100644
--- a/src/com/fsck/k9/activity/setup/WelcomeMessage.java
+++ b/src/com/fsck/k9/activity/setup/WelcomeMessage.java
@@ -46,8 +46,7 @@ public class WelcomeMessage extends K9Activity implements OnClickListener{
                 break;
             }
             case R.id.import_settings: {
-                startActivity(new Intent(getApplicationContext(), Accounts.class)
-                    .putExtra(Accounts.EXTRA_IMPORTFIRST, true));
+                Accounts.importSettings(this);
                 finish();
                 break;
             }