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

astyle

This commit is contained in:
danapple 2011-03-02 07:34:54 -06:00
parent 107408c0d9
commit 32b5afc702
10 changed files with 83 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/com/fsck/k9/activity/Accounts.java
View File

@ -139,8 +139,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
}
}
public void setProgress(boolean progress)
{
public void setProgress(boolean progress) {
mHandler.progress(progress);
}
@ -242,8 +241,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
}
@Override
public void onNewIntent(Intent intent)
{
public void onNewIntent(Intent intent) {
Uri uri = intent.getData();
Log.i(K9.LOG_TAG, "Accounts Activity got uri " + uri);
if (uri != null) {
@ -783,8 +781,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
}
}
private void onImport()
{
private void onImport() {
Intent i = new Intent(Intent.ACTION_GET_CONTENT);
i.addCategory(Intent.CATEGORY_OPENABLE);
i.setType("*/*");
@ -792,61 +789,47 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
Log.i(K9.LOG_TAG, "onActivityResult requestCode = " + requestCode + ", resultCode = " + resultCode + ", data = " + data);
if (resultCode != RESULT_OK)
return;
if (data == null)
{
if (data == null) {
return;
}
switch (requestCode)
{
switch (requestCode) {
case ACTIVITY_REQUEST_PICK_SETTINGS_FILE:
onImport(data.getData());
break;
}
}
private void onImport(Uri uri)
{
private void onImport(Uri uri) {
Log.i(K9.LOG_TAG, "onImport importing from URI " + uri.getPath());
try
{
try {
final String fileName = uri.getPath();
ContentResolver resolver = getContentResolver();
final InputStream is = resolver.openInputStream(uri);
PasswordEntryDialog dialog = new PasswordEntryDialog(this, getString(R.string.settings_encryption_password_prompt),
new PasswordEntryDialog.PasswordEntryListener()
{
public void passwordChosen(String chosenPassword)
{
new PasswordEntryDialog.PasswordEntryListener() {
public void passwordChosen(String chosenPassword) {
String toastText = Accounts.this.getString(R.string.settings_importing);
Toast toast = Toast.makeText(Accounts.this.getApplication(), toastText, Toast.LENGTH_SHORT);
toast.show();
mHandler.progress(true);
AsyncUIProcessor.getInstance(Accounts.this.getApplication()).importSettings(is, chosenPassword, new ImportListener()
{
public void failure(final String message, Exception e)
{
Accounts.this.runOnUiThread(new Runnable()
{
public void run()
{
AsyncUIProcessor.getInstance(Accounts.this.getApplication()).importSettings(is, chosenPassword, new ImportListener() {
public void failure(final String message, Exception e) {
Accounts.this.runOnUiThread(new Runnable() {
public void run() {
mHandler.progress(false);
showDialog(Accounts.this, R.string.settings_import_failed_header, Accounts.this.getString(R.string.settings_import_failure, fileName, message));
}
});
}
public void importSuccess(final int numAccounts)
{
Accounts.this.runOnUiThread(new Runnable()
{
public void run()
{
public void importSuccess(final int numAccounts) {
Accounts.this.runOnUiThread(new Runnable() {
public void run() {
mHandler.progress(false);
String messageText =
numAccounts != 1
@ -860,22 +843,18 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
});
}
public void cancel()
{
public void cancel() {
}
});
dialog.show();
}
catch (FileNotFoundException fnfe)
{
} catch (FileNotFoundException fnfe) {
String toastText = Accounts.this.getString(R.string.settings_import_failure, uri.getPath(), fnfe.getMessage());
Toast toast = Toast.makeText(Accounts.this.getApplication(), toastText, 1);
toast.show();
}
}
private static void showDialog(final Activity activity, int headerRes, String message)
{
private static void showDialog(final Activity activity, int headerRes, String message) {
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(headerRes);
builder.setMessage(message);

3
src/com/fsck/k9/activity/ActivityListener.java
View File

@ -37,8 +37,7 @@ public class ActivityListener extends MessagingListener {
String displayName = mLoadingFolderName;
if (K9.INBOX.equalsIgnoreCase(displayName)) {
displayName = context.getString(R.string.special_mailbox_name_inbox);
}
else if ((mAccount != null) && mAccount.getOutboxFolderName().equals(displayName)) {
} else if ((mAccount != null) && mAccount.getOutboxFolderName().equals(displayName)) {
displayName = context.getString(R.string.special_mailbox_name_outbox);
}

3
src/com/fsck/k9/activity/ExportHelper.java
View File

@ -48,8 +48,7 @@ public class ExportHelper {
});
dialog.show();
}
private static void showDialog(final Activity activity, int headerRes, String message)
{
private static void showDialog(final Activity activity, int headerRes, String message) {
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(headerRes);
builder.setMessage(message);

3
src/com/fsck/k9/activity/FolderList.java
View File

@ -151,8 +151,7 @@ public class FolderList extends K9ListActivity {
}
}
public void setProgress(boolean progress)
{
public void setProgress(boolean progress) {
mHandler.progress(progress);
}

3
src/com/fsck/k9/activity/MessageList.java
View File

@ -519,8 +519,7 @@ public class MessageList
}
}
public void setProgress(boolean progress)
{
public void setProgress(boolean progress) {
mHandler.progress(progress);
}

6
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -854,11 +854,9 @@ public class AccountSettings extends K9PreferenceActivity {
// TODO: In the future the call above should be changed to only return remote folders.
// For now we just remove the Outbox folder if present.
Iterator <? extends Folder > iter = folders.iterator();
while (iter.hasNext())
{
while (iter.hasNext()) {
Folder folder = iter.next();
if (mAccount.getOutboxFolderName().equals(folder.getName()))
{
if (mAccount.getOutboxFolderName().equals(folder.getName())) {
iter.remove();
}
}

3
src/com/fsck/k9/mail/internet/MimeHeader.java
View File

@ -142,8 +142,7 @@ public class MimeHeader {
}
}
public void setCharset(String charset)
{
public void setCharset(String charset) {
mCharset = charset;
}
}

12
src/com/fsck/k9/preferences/K9Krypto.java
View File

@ -14,21 +14,18 @@ import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.codec.binary.Base64;
public class K9Krypto
{
public class K9Krypto {
final Base64 mBase64;
final Cipher mCipher;
private final static String AES = "AES";
private final static String SECURE_RANDOM_TYPE = "SHA1PRNG";
public enum MODE
{
public enum MODE {
ENCRYPT(Cipher.ENCRYPT_MODE), DECRYPT(Cipher.DECRYPT_MODE);
int mode;
private MODE(int nMode)
{
private MODE(int nMode) {
mode = nMode;
}
}
@ -56,8 +53,7 @@ public class K9Krypto
return new String(plainText);
}
private Cipher setupCipher(int mode, byte[] processedKey) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException
{
private Cipher setupCipher(int mode, byte[] processedKey) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
SecretKeySpec secretKeySpec = new SecretKeySpec(processedKey, AES);
Cipher cipher = Cipher.getInstance(AES);
cipher.init(mode, secretKeySpec);