From 9bf546b33bba47dbf9e19e60d52ae278428858aa Mon Sep 17 00:00:00 2001 From: Marine Date: Mon, 16 Feb 2015 15:25:36 +0100 Subject: [PATCH 1/3] removed redundant assignment to AccountSetupBasics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit removed null affectation because it’s done automatically --- .../java/com/fsck/k9/activity/setup/AccountSetupBasics.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java index a0c129541..8c5f4b0df 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -277,8 +277,8 @@ public class AccountSetupBasics extends K9Activity String[] emailParts = splitEmail(email); String user = emailParts[0]; String domain = emailParts[1]; - URI incomingUri = null; - URI outgoingUri = null; + URI incomingUri; + URI outgoingUri; try { String userEnc = UrlEncodingHelper.encodeUtf8(user); String passwordEnc = UrlEncodingHelper.encodeUtf8(password); @@ -400,7 +400,7 @@ public class AccountSetupBasics extends K9Activity String password = null; String clientCertificateAlias = null; - AuthType authenticationType = null; + AuthType authenticationType; if (mClientCertificateCheckBox.isChecked()) { authenticationType = AuthType.EXTERNAL; clientCertificateAlias = mClientCertificateSpinner.getAlias(); From c4e202ecd93be1454abd597aa1857683ceed1aa7 Mon Sep 17 00:00:00 2001 From: Marine Date: Mon, 16 Feb 2015 15:31:03 +0100 Subject: [PATCH 2/3] remove redundant assignment to FolderSettings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit removed null affectation because it’s done automatically --- .../main/java/com/fsck/k9/activity/setup/FolderSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java index 737e2ffc3..c7780d778 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java @@ -67,7 +67,7 @@ public class FolderSettings extends K9PreferenceActivity { } boolean isPushCapable = false; - Store store = null; + Store store; try { store = mAccount.getRemoteStore(); isPushCapable = store.isPushCapable(); From abd2b208508b18d3112903d858a7db7a2a450d03 Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 6 Mar 2015 23:08:34 +0100 Subject: [PATCH 3/3] Minimize scope of local variables --- .../com/fsck/k9/activity/setup/AccountSetupBasics.java | 8 +++----- .../java/com/fsck/k9/activity/setup/FolderSettings.java | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java index 8c5f4b0df..e95a114d8 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -277,8 +277,6 @@ public class AccountSetupBasics extends K9Activity String[] emailParts = splitEmail(email); String user = emailParts[0]; String domain = emailParts[1]; - URI incomingUri; - URI outgoingUri; try { String userEnc = UrlEncodingHelper.encodeUtf8(user); String passwordEnc = UrlEncodingHelper.encodeUtf8(password); @@ -289,15 +287,15 @@ public class AccountSetupBasics extends K9Activity incomingUsername = incomingUsername.replaceAll("\\$domain", domain); URI incomingUriTemplate = mProvider.incomingUriTemplate; - incomingUri = new URI(incomingUriTemplate.getScheme(), incomingUsername + ":" - + passwordEnc, incomingUriTemplate.getHost(), incomingUriTemplate.getPort(), null, - null, null); + URI incomingUri = new URI(incomingUriTemplate.getScheme(), incomingUsername + ":" + passwordEnc, + incomingUriTemplate.getHost(), incomingUriTemplate.getPort(), null, null, null); String outgoingUsername = mProvider.outgoingUsernameTemplate; URI outgoingUriTemplate = mProvider.outgoingUriTemplate; + URI outgoingUri; if (outgoingUsername != null) { outgoingUsername = outgoingUsername.replaceAll("\\$email", email); outgoingUsername = outgoingUsername.replaceAll("\\$user", userEnc); diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java index c7780d778..682b57921 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java @@ -67,9 +67,8 @@ public class FolderSettings extends K9PreferenceActivity { } boolean isPushCapable = false; - Store store; try { - store = mAccount.getRemoteStore(); + Store store = mAccount.getRemoteStore(); isPushCapable = store.isPushCapable(); } catch (Exception e) { Log.e(K9.LOG_TAG, "Could not get remote store", e);