astyle-d (ad3dd07a) · Commits · e / os / Mail

build.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,11 @@
		<arg path="${out-debug-package}" />
		</exec>
		</target>
		<target name="astyle">
		<exec executable="astyle" failonerror="true">
		<arg line="--style=java --indent=spaces=4 --brackets=attach --convert-tabs --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java'"/>
		</exec>
		</target>

		<target name="help">
		<!-- displays starts at col 13
		@@ -170,6 +175,7 @@
		<echo> device.</echo>
		<echo> bump-version: ant -Dversion-name=3.123</echo>
		<echo> Bumps the project version to 3.123,tags and commits it</echo>
		<echo> astyle: Make K-9's source look like it's supposed to</echo>
		</target>

		</project>

src/com/fsck/k9/Account.java

+257 −494

File changed.

Preview size limit exceeded, changes collapsed.

src/com/fsck/k9/AccountStats.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,7 @@ package com.fsck.k9;

		import java.io.Serializable;

		public class AccountStats implements Serializable
		{
		public class AccountStats implements Serializable {
		private static final long serialVersionUID = -5706839923710842234L;
		public long size = -1;
		public int unreadMessageCount = 0;

src/com/fsck/k9/BaseAccount.java

+1 −2

Original line number	Diff line number	Diff line
		package com.fsck.k9;

		public interface BaseAccount
		{
		public interface BaseAccount {
		public String getEmail();
		public void setEmail(String email);
		public String getDescription();

src/com/fsck/k9/EmailAddressAdapter.java

+7 −14

Original line number	Diff line number	Diff line
		@@ -24,14 +24,11 @@ import android.view.View;
		import android.widget.ResourceCursorAdapter;
		import android.widget.TextView;

		public class EmailAddressAdapter extends ResourceCursorAdapter
		{
		public class EmailAddressAdapter extends ResourceCursorAdapter {
		private static EmailAddressAdapter sInstance;

		public static EmailAddressAdapter getInstance(Context context)
		{
		if (sInstance == null)
		{
		public static EmailAddressAdapter getInstance(Context context) {
		if (sInstance == null) {
		sInstance = new EmailAddressAdapter(context);
		}

		@@ -41,15 +38,13 @@ public class EmailAddressAdapter extends ResourceCursorAdapter

		private final Contacts mContacts;

		private EmailAddressAdapter(Context context)
		{
		private EmailAddressAdapter(Context context) {
		super(context, R.layout.recipient_dropdown_item, null);
		mContacts = Contacts.getInstance(context);
		}

		@Override
		public final String convertToString(final Cursor cursor)
		{
		public final String convertToString(final Cursor cursor) {
		final String name = mContacts.getName(cursor);
		final String address = mContacts.getEmail(cursor);

		@@ -57,8 +52,7 @@ public class EmailAddressAdapter extends ResourceCursorAdapter
		}

		@Override
		public final void bindView(final View view, final Context context, final Cursor cursor)
		{
		public final void bindView(final View view, final Context context, final Cursor cursor) {
		final TextView text1 = (TextView) view.findViewById(R.id.text1);
		final TextView text2 = (TextView) view.findViewById(R.id.text2);
		text1.setText(mContacts.getName(cursor));
		@@ -66,8 +60,7 @@ public class EmailAddressAdapter extends ResourceCursorAdapter
		}

		@Override
		public Cursor runQueryOnBackgroundThread(CharSequence constraint)
		{
		public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
		return mContacts.searchContacts(constraint);
		}
		}