moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #454 from mallamanis/master 

Renaming variables for codebase consistency
This commit is contained in:
cketti 2014-03-01 07:39:07 +01:00
parent fa7118dab3 c17d0323f2
commit bf9264dbb0
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -1737,28 +1737,28 @@ public class MessageCompose extends K9Activity implements OnClickListener,
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Got a saved legacy identity: " + identityString);
StringTokenizer tokens = new StringTokenizer(identityString, ":", false);
StringTokenizer tokenizer = new StringTokenizer(identityString, ":", false);
// First item is the body length. We use this to separate the composed reply from the quoted text.
if (tokens.hasMoreTokens()) {
String bodyLengthS = Utility.base64Decode(tokens.nextToken());
if (tokenizer.hasMoreTokens()) {
String bodyLengthS = Utility.base64Decode(tokenizer.nextToken());
try {
identity.put(IdentityField.LENGTH, Integer.valueOf(bodyLengthS).toString());
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Unable to parse bodyLength '" + bodyLengthS + "'");
}
}
if (tokens.hasMoreTokens()) {
identity.put(IdentityField.SIGNATURE, Utility.base64Decode(tokens.nextToken()));
if (tokenizer.hasMoreTokens()) {
identity.put(IdentityField.SIGNATURE, Utility.base64Decode(tokenizer.nextToken()));
}
if (tokens.hasMoreTokens()) {
identity.put(IdentityField.NAME, Utility.base64Decode(tokens.nextToken()));
if (tokenizer.hasMoreTokens()) {
identity.put(IdentityField.NAME, Utility.base64Decode(tokenizer.nextToken()));
}
if (tokens.hasMoreTokens()) {
identity.put(IdentityField.EMAIL, Utility.base64Decode(tokens.nextToken()));
if (tokenizer.hasMoreTokens()) {
identity.put(IdentityField.EMAIL, Utility.base64Decode(tokenizer.nextToken()));
}
if (tokens.hasMoreTokens()) {
identity.put(IdentityField.QUOTED_TEXT_MODE, Utility.base64Decode(tokens.nextToken()));
if (tokenizer.hasMoreTokens()) {
identity.put(IdentityField.QUOTED_TEXT_MODE, Utility.base64Decode(tokenizer.nextToken()));
}
}

10
src/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -1008,17 +1008,17 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
private FolderInfoHolder getFolder(String folder, Account account) {
LocalFolder local_folder = null;
LocalFolder localFolder = null;
try {
LocalStore localStore = account.getLocalStore();
local_folder = localStore.getFolder(folder);
return new FolderInfoHolder(mContext, local_folder, account);
localFolder = localStore.getFolder(folder);
return new FolderInfoHolder(mContext, localFolder, account);
} catch (Exception e) {
Log.e(K9.LOG_TAG, "getFolder(" + folder + ") goes boom: ", e);
return null;
} finally {
if (local_folder != null) {
local_folder.close();
if (localFolder != null) {
localFolder.close();
}
}
}

2
src/com/fsck/k9/mail/internet/TextBody.java
View File

@ -63,7 +63,7 @@ public class TextBody implements Body {
b = EMPTY_BYTE_ARRAY;
}
return new ByteArrayInputStream(b);
} catch (UnsupportedEncodingException usee) {
} catch (UnsupportedEncodingException uee) {
return null;
}
}

8
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -1068,7 +1068,7 @@ public class LocalStore extends Store implements Serializable {
return null;
}
});
} catch (UnsupportedEncodingException usee) {
} catch (UnsupportedEncodingException uee) {
throw new Error("Aparently UTF-8 has been lost to the annals of history.");
}
}
@ -2807,10 +2807,10 @@ public class LocalStore extends Store implements Serializable {
*/
String disposition = attachment.getDisposition();
if (disposition != null) {
String s = MimeUtility.getHeaderParameter(disposition, "size");
if (s != null) {
String sizeParam = MimeUtility.getHeaderParameter(disposition, "size");
if (sizeParam != null) {
try {
size = Integer.parseInt(s);
size = Integer.parseInt(sizeParam);
} catch (NumberFormatException e) { /* Ignore */ }
}
}

4
src/com/fsck/k9/preferences/SettingsImporter.java
View File

@ -608,8 +608,8 @@ public class SettingsImporter {
}
private static boolean isIdentityDescriptionUsed(String description, List<Identity> identities) {
for (Identity identitiy : identities) {
if (identitiy.getDescription().equals(description)) {
for (Identity identity : identities) {
if (identity.getDescription().equals(description)) {
return true;
}
}