mirror of https://github.com/moparisthebest/k-9
astyle
This commit is contained in:
parent
7300aca2b8
commit
e0447e32cc
|
@ -1491,8 +1491,10 @@ public class Account implements BaseAccount
|
||||||
lastSelectedFolderName = folderName;
|
lastSelectedFolderName = folderName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized CryptoProvider getCryptoProvider() {
|
public synchronized CryptoProvider getCryptoProvider()
|
||||||
if (mCryptoProvider == null) {
|
{
|
||||||
|
if (mCryptoProvider == null)
|
||||||
|
{
|
||||||
mCryptoProvider = CryptoProvider.createInstance(getCryptoApp());
|
mCryptoProvider = CryptoProvider.createInstance(getCryptoApp());
|
||||||
}
|
}
|
||||||
return mCryptoProvider;
|
return mCryptoProvider;
|
||||||
|
|
|
@ -1733,8 +1733,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
|
||||||
final String escapedPrefix = prefix.replaceAll("(\\\\|\\$)", "\\\\$1");
|
final String escapedPrefix = prefix.replaceAll("(\\\\|\\$)", "\\\\$1");
|
||||||
|
|
||||||
final String text = (mSourceMessageBody != null) ?
|
final String text = (mSourceMessageBody != null) ?
|
||||||
mSourceMessageBody :
|
mSourceMessageBody :
|
||||||
MimeUtility.getTextFromPart(part);
|
MimeUtility.getTextFromPart(part);
|
||||||
|
|
||||||
final String wrappedText = Utility.wrap(text, REPLY_WRAP_LINE_WIDTH - prefix.length());
|
final String wrappedText = Utility.wrap(text, REPLY_WRAP_LINE_WIDTH - prefix.length());
|
||||||
|
|
||||||
|
|
|
@ -787,8 +787,8 @@ public class AccountSettings extends K9PreferenceActivity
|
||||||
// Do the vibration to show the user what it's like.
|
// Do the vibration to show the user what it's like.
|
||||||
Vibrator vibrate = (Vibrator)preference.getContext().getSystemService(Context.VIBRATOR_SERVICE);
|
Vibrator vibrate = (Vibrator)preference.getContext().getSystemService(Context.VIBRATOR_SERVICE);
|
||||||
long[] pattern = MessagingController.getVibratePattern(
|
long[] pattern = MessagingController.getVibratePattern(
|
||||||
Integer.parseInt(mAccountVibratePattern.getValue()),
|
Integer.parseInt(mAccountVibratePattern.getValue()),
|
||||||
Integer.parseInt(mAccountVibrateTimes.getValue()));
|
Integer.parseInt(mAccountVibrateTimes.getValue()));
|
||||||
vibrate.vibrate(pattern, -1);
|
vibrate.vibrate(pattern, -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2499,13 +2499,13 @@ public class MessagingController implements Runnable
|
||||||
Store remoteStore = account.getRemoteStore();
|
Store remoteStore = account.getRemoteStore();
|
||||||
Folder remoteFolder = remoteStore.getFolder(folder);
|
Folder remoteFolder = remoteStore.getFolder(folder);
|
||||||
if (!remoteFolder.exists() ||
|
if (!remoteFolder.exists() ||
|
||||||
/*
|
/*
|
||||||
* Don't proceed if the remote folder doesn't support flags and
|
* Don't proceed if the remote folder doesn't support flags and
|
||||||
* the flag to be changed isn't the deleted flag. This avoids
|
* the flag to be changed isn't the deleted flag. This avoids
|
||||||
* unnecessary connections to POP3 servers.
|
* unnecessary connections to POP3 servers.
|
||||||
*/
|
*/
|
||||||
// TODO: This should actually call a supportsSettingFlag(flag) method.
|
// TODO: This should actually call a supportsSettingFlag(flag) method.
|
||||||
(!remoteFolder.supportsFetchingFlags() && !Flag.DELETED.equals(flag)))
|
(!remoteFolder.supportsFetchingFlags() && !Flag.DELETED.equals(flag)))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,8 @@ package com.fsck.k9.crypto;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
public class PgpData implements Serializable {
|
public class PgpData implements Serializable
|
||||||
|
{
|
||||||
protected long mEncryptionKeyIds[] = null;
|
protected long mEncryptionKeyIds[] = null;
|
||||||
protected long mSignatureKeyId = 0;
|
protected long mSignatureKeyId = 0;
|
||||||
protected String mSignatureUserId = null;
|
protected String mSignatureUserId = null;
|
||||||
|
|
|
@ -166,9 +166,9 @@ public class MimeHeader
|
||||||
|
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder("(");
|
StringBuilder sb = new StringBuilder("(");
|
||||||
sb.append(name).append('=').append(value).append(')');
|
sb.append(name).append('=').append(value).append(')');
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -202,9 +202,10 @@ public class MessageProvider extends ContentProvider
|
||||||
|
|
||||||
public void setApplication(Application app)
|
public void setApplication(Application app)
|
||||||
{
|
{
|
||||||
if (context == null) {
|
if (context == null)
|
||||||
context = app.getApplicationContext();
|
{
|
||||||
}
|
context = app.getApplicationContext();
|
||||||
|
}
|
||||||
if (app != null)
|
if (app != null)
|
||||||
{
|
{
|
||||||
mApp = app;
|
mApp = app;
|
||||||
|
|
Loading…
Reference in New Issue