more renaming. (c7de6648) · Commits · e / os / Mail

src/com/fsck/k9/MessagingController.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public class MessagingController implements Runnable {
		}
		catch (Exception e) {
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "Error running command", e);
		Log.v(k9.LOG_TAG, "Error running command", e);
		}
		}
		mBusy = false;
		@@ -211,7 +211,7 @@ public class MessagingController implements Runnable {
		*/
		for (Folder localFolder : localFolders) {
		String localFolderName = localFolder.getName();
		if (localFolderName.equalsIgnoreCase(Email.INBOX) \|\|
		if (localFolderName.equalsIgnoreCase(k9.INBOX) \|\|
		localFolderName.equals(account.getTrashFolderName()) \|\|
		localFolderName.equals(account.getOutboxFolderName()) \|\|
		localFolderName.equals(account.getDraftsFolderName()) \|\|
		@@ -293,7 +293,7 @@ public class MessagingController implements Runnable {
		mApplication);
		LocalFolder localFolder = (LocalFolder) localStore.getFolder(folder);
		localFolder.setVisibleLimit(localFolder.getVisibleLimit()
		+ Email.VISIBLE_LIMIT_INCREMENT);
		+ k9.VISIBLE_LIMIT_INCREMENT);
		synchronizeMailbox(account, folder, listener);
		}
		catch (MessagingException me) {
		@@ -309,7 +309,7 @@ public class MessagingController implements Runnable {
		localStore.resetVisibleLimits();
		}
		catch (MessagingException e) {
		Log.e(Email.LOG_TAG, "Unable to reset visible limits", e);
		Log.e(k9.LOG_TAG, "Unable to reset visible limits", e);
		}
		}
		}
		@@ -402,8 +402,8 @@ public class MessagingController implements Runnable {
		Open the folder
		Upload any local messages that are marked as PENDING_UPLOAD (Drafts, Sent, Trash)
		Get the message count
		Get the list of the newest Email.DEFAULT_VISIBLE_LIMIT messages
		getMessages(messageCount - Email.DEFAULT_VISIBLE_LIMIT, messageCount)
		Get the list of the newest k9.DEFAULT_VISIBLE_LIMIT messages
		getMessages(messageCount - k9.DEFAULT_VISIBLE_LIMIT, messageCount)
		See if we have each message locally, if not fetch it's flags and envelope
		Get and update the unread count for the folder
		Update the remote flags of any messages we have locally with an internal date
		@@ -531,7 +531,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		}
		}
		catch (Exception e) {
		Log.e(Email.LOG_TAG,
		Log.e(k9.LOG_TAG,
		"Error while storing downloaded message.",
		e);
		}
		@@ -735,7 +735,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		}
		catch (Exception e) {
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "synchronizeMailbox", e);
		Log.v(k9.LOG_TAG, "synchronizeMailbox", e);
		}
		for (MessagingListener l : mListeners) {
		l.synchronizeMailboxFailed(
		@@ -766,7 +766,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		}
		catch (MessagingException me) {
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "processPendingCommands", me);
		Log.v(k9.LOG_TAG, "processPendingCommands", me);
		}
		/*
		* Ignore any exceptions from the commands. Commands will be processed
		@@ -1213,7 +1213,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		}
		catch (MessagingException me) {
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "", me);
		Log.v(k9.LOG_TAG, "", me);
		}
		for (MessagingListener l : mListeners) {
		l.loadAttachmentFailed(account, message, part, tag, me.getMessage());
		@@ -1400,7 +1400,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		catch (Exception e) {
		// TODO
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "emptyTrash");
		Log.v(k9.LOG_TAG, "emptyTrash");
		}
		}
		}
		@@ -1432,7 +1432,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		}
		for (Account account : accounts) {
		sendPendingMessagesSynchronous(account);
		synchronizeMailboxSynchronous(account, Email.INBOX);
		synchronizeMailboxSynchronous(account, k9.INBOX);
		}
		for (MessagingListener l : mListeners) {
		l.checkMailFinished(context, account);
		@@ -1462,7 +1462,7 @@ s * critical data as fast as possible, and then we'll fill in the de
		processPendingCommands(account);
		}
		catch (MessagingException e) {
		Log.e(Email.LOG_TAG, "Unable to save message as draft.", e);
		Log.e(k9.LOG_TAG, "Unable to save message as draft.", e);
		}
		}

src/com/fsck/k9/Preferences.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ public class Preferences {
		public void dump() {
		if (Config.LOGV) {
		for (String key : mSharedPreferences.getAll().keySet()) {
		Log.v(Email.LOG_TAG, key + " = " + mSharedPreferences.getAll().get(key));
		Log.v(k9.LOG_TAG, key + " = " + mSharedPreferences.getAll().get(key));
		}
		}
		}

src/com/fsck/k9/activity/Accounts.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
		import android.widget.AdapterView.OnItemClickListener;

		import com.fsck.k9.Account;
		import com.fsck.k9.Email;
		import com.fsck.k9.k9;
		import com.fsck.k9.MessagingController;
		import com.fsck.k9.Preferences;
		import com.fsck.k9.R;
		@@ -152,7 +152,7 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
		// Ignore
		}
		mSelectedContextAccount.delete(Preferences.getPreferences(Accounts.this));
		Email.setServicesEnabled(Accounts.this);
		k9.setServicesEnabled(Accounts.this);
		refresh();
		}
		})
		@@ -269,7 +269,7 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
		LocalStore localStore = (LocalStore) Store.getInstance(
		account.getLocalStoreUri(),
		getApplication());
		LocalFolder localFolder = (LocalFolder) localStore.getFolder(Email.INBOX);
		LocalFolder localFolder = (LocalFolder) localStore.getFolder(k9.INBOX);
		if (localFolder.exists()) {
		unreadMessageCount = localFolder.getUnreadMessageCount();
		}

src/com/fsck/k9/activity/Debug.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ import android.widget.CompoundButton;
		import android.widget.TextView;
		import android.widget.CompoundButton.OnCheckedChangeListener;

		import com.fsck.k9.Email;
		import com.fsck.k9.k9;
		import com.fsck.k9.Preferences;
		import com.fsck.k9.R;

		@@ -39,17 +39,17 @@ public class Debug extends Activity implements OnCheckedChangeListener {
		mVersionView.setText(String.format(getString(R.string.debug_version_fmt).toString(),
		getString(R.string.build_number)));

		mEnableDebugLoggingView.setChecked(Email.DEBUG);
		mEnableSensitiveLoggingView.setChecked(Email.DEBUG_SENSITIVE);
		mEnableDebugLoggingView.setChecked(k9.DEBUG);
		mEnableSensitiveLoggingView.setChecked(k9.DEBUG_SENSITIVE);
		}

		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
		if (buttonView.getId() == R.id.debug_logging) {
		Email.DEBUG = isChecked;
		mPreferences.setEnableDebugLogging(Email.DEBUG);
		k9.DEBUG = isChecked;
		mPreferences.setEnableDebugLogging(k9.DEBUG);
		} else if (buttonView.getId() == R.id.sensitive_logging) {
		Email.DEBUG_SENSITIVE = isChecked;
		mPreferences.setEnableSensitiveLogging(Email.DEBUG_SENSITIVE);
		k9.DEBUG_SENSITIVE = isChecked;
		mPreferences.setEnableSensitiveLogging(k9.DEBUG_SENSITIVE);
		}
		}

src/com/fsck/k9/activity/FolderMessageList.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import android.widget.Toast;
		import android.widget.ExpandableListView.ExpandableListContextMenuInfo;

		import com.fsck.k9.Account;
		import com.fsck.k9.Email;
		import com.fsck.k9.k9;
		import com.fsck.k9.MessagingController;
		import com.fsck.k9.MessagingListener;
		import com.fsck.k9.R;
		@@ -700,7 +700,7 @@ public class FolderMessageList extends ExpandableListActivity {
		}
		mHandler.progress(false);
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "listFoldersFailed " + message);
		Log.v(k9.LOG_TAG, "listFoldersFailed " + message);
		}
		}

		@@ -731,7 +731,7 @@ public class FolderMessageList extends ExpandableListActivity {
		mFolders.add(holder);
		}
		holder.name = folder.getName();
		if (holder.name.equalsIgnoreCase(Email.INBOX)) {
		if (holder.name.equalsIgnoreCase(k9.INBOX)) {
		holder.displayName = getString(R.string.special_mailbox_name_inbox);
		}
		else {
		@@ -749,7 +749,7 @@ public class FolderMessageList extends ExpandableListActivity {
		folder.close(false);
		}
		catch (MessagingException me) {
		Log.e(Email.LOG_TAG, "Folder.getUnreadMessageCount() failed", me);
		Log.e(k9.LOG_TAG, "Folder.getUnreadMessageCount() failed", me);
		}
		}

		@@ -763,7 +763,7 @@ public class FolderMessageList extends ExpandableListActivity {
		*/
		// if (mRestoredState != null) {
		// if (Config.LOGV) {
		// Log.v(Email.LOG_TAG, "Attempting to restore list state");
		// Log.v(k9.LOG_TAG, "Attempting to restore list state");
		// }
		// Parcelable listViewState =
		// mListView.onRestoreInstanceState(mListViewState);
		@@ -1199,9 +1199,9 @@ public class FolderMessageList extends ExpandableListActivity {
		public int compareTo(FolderInfoHolder o) {
		String s1 = this.name;
		String s2 = o.name;
		if (Email.INBOX.equalsIgnoreCase(s1)) {
		if (k9.INBOX.equalsIgnoreCase(s1)) {
		return -1;
		} else if (Email.INBOX.equalsIgnoreCase(s2)) {
		} else if (k9.INBOX.equalsIgnoreCase(s2)) {
		return 1;
		} else
		return s1.toUpperCase().compareTo(s2.toUpperCase());
		@@ -1248,7 +1248,7 @@ public class FolderMessageList extends ExpandableListActivity {
		}
		catch (MessagingException me) {
		if (Config.LOGV) {
		Log.v(Email.LOG_TAG, "Unable to load message info", me);
		Log.v(k9.LOG_TAG, "Unable to load message info", me);
		}
		}
		}