remove accidental static imports (73091326) · Commits · e / os / Mail

k9mail/src/main/java/com/fsck/k9/Account.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -760,7 +760,7 @@ public class Account implements BaseAccount, StoreConfig {
		try {
		getLocalStore().resetVisibleLimits(getDisplayCount());
		} catch (MessagingException e) {
		Timber.e("Unable to reset visible limits", e);
		Timber.e(e, "Unable to reset visible limits");
		}

		}
		@@ -953,8 +953,8 @@ public class Account implements BaseAccount, StoreConfig {
		switchLocalStorage(id);
		successful = true;
		} catch (MessagingException e) {
		Timber.e("Switching local storage provider from " +
		mLocalStorageProviderId + " to " + id + " failed.", e);
		Timber.e(e, "Switching local storage provider from " +
		mLocalStorageProviderId + " to " + id + " failed.");
		}

		// if migration to/from SD-card failed once, it will fail again.

k9mail/src/main/java/com/fsck/k9/K9.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.os.Handler;
		import android.os.Looper;
		import android.os.StrictMode;
		import android.text.format.Time;
		import timber.log.Timber;

		import com.fsck.k9.Account.SortType;
		import com.fsck.k9.activity.MessageCompose;
		@@ -47,9 +46,6 @@ import com.fsck.k9.service.StorageGoneReceiver;
		import com.fsck.k9.widget.list.MessageListWidgetProvider;
		import timber.log.Timber;

		import static timber.log.Timber.i;
		import static timber.log.Timber.v;


		public class K9 extends Application {
		/**
		@@ -421,7 +417,7 @@ public class K9 extends Application {
		try {
		queue.put(new Handler());
		} catch (InterruptedException e) {
		Timber.e("", e);
		Timber.e(e, "");
		}
		Looper.loop();
		}
		@@ -431,13 +427,13 @@ public class K9 extends Application {
		try {
		final Handler storageGoneHandler = queue.take();
		registerReceiver(receiver, filter, null, storageGoneHandler);
		i("Registered: unmount receiver");
		Timber.i("Registered: unmount receiver");
		} catch (InterruptedException e) {
		Timber.e("Unable to register unmount receiver", e);
		Timber.e(e, "Unable to register unmount receiver");
		}

		registerReceiver(new ShutdownReceiver(), new IntentFilter(Intent.ACTION_SHUTDOWN));
		i("Registered: shutdown receiver");
		Timber.i("Registered: shutdown receiver");
		}

		public static void save(StorageEditor editor) {
		@@ -582,7 +578,7 @@ public class K9 extends Application {
		UnreadWidgetProvider.updateUnreadCount(K9.this);
		} catch (Exception e) {
		if (K9.DEBUG) {
		Timber.e("Error while updating unread widget(s)", e);
		Timber.e(e, "Error while updating unread widget(s)");
		}
		}
		}
		@@ -594,7 +590,7 @@ public class K9 extends Application {
		if (BuildConfig.DEBUG) {
		throw e;
		} else if (K9.DEBUG) {
		Timber.e("Error while updating message list widget", e);
		Timber.e(e, "Error while updating message list widget");
		}
		}
		}
		@@ -804,12 +800,12 @@ public class K9 extends Application {
		synchronized (observers) {
		for (final ApplicationAware aware : observers) {
		if (K9.DEBUG) {
		v("Initializing observer: " + aware);
		Timber.v("Initializing observer: " + aware);
		}
		try {
		aware.initializeComponent(this);
		} catch (Exception e) {
		Timber.w("Failure when notifying " + aware, e);
		Timber.w(e, "Failure when notifying " + aware);
		}
		}

k9mail/src/main/java/com/fsck/k9/Preferences.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class Preferences {
		try {
		RemoteStore.removeInstance(account);
		} catch (Exception e) {
		Timber.e("Failed to reset remote store for account " + account.getUuid(), e);
		Timber.e(e, "Failed to reset remote store for account " + account.getUuid());
		}
		LocalStore.removeAccount(account);

		@@ -178,8 +178,8 @@ public class Preferences {
		try {
		return Enum.valueOf(defaultEnum.getDeclaringClass(), stringPref);
		} catch (IllegalArgumentException ex) {
		Timber.w("Unable to convert preference key [" + key +
		"] value [" + stringPref + "] to enum of type " + defaultEnum.getDeclaringClass(), ex);
		Timber.w(ex, "Unable to convert preference key [" + key +
		"] value [" + stringPref + "] to enum of type " + defaultEnum.getDeclaringClass());

		return defaultEnum;
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
		accountStatusChanged(account, stats);
		}
		} catch (Exception e) {
		Timber.e("Unable to get account stats", e);
		Timber.e(e, "Unable to get account stats");
		}
		}
		@Override
		@@ -995,7 +995,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
		// Get list of folders from remote server
		MessagingController.getInstance(mApplication).listFolders(mAccount, true, null);
		} catch (Exception e) {
		Timber.e("Something went while setting account passwords", e);
		Timber.e(e, "Something went while setting account passwords");
		}
		return null;
		}
		@@ -1926,7 +1926,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
		mFileName = SettingsExporter.exportToFile(mContext, mIncludeGlobals,
		mAccountUuids);
		} catch (SettingsImportExportException e) {
		Timber.w("Exception during export", e);
		Timber.w(e, "Exception during export");
		return false;
		}
		return true;
		@@ -1993,13 +1993,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
		}
		}
		} catch (SettingsImportExportException e) {
		Timber.w("Exception during import", e);
		Timber.w(e, "Exception during import");
		return false;
		} catch (FileNotFoundException e) {
		Timber.w("Couldn't open import file", e);
		Timber.w(e, "Couldn't open import file");
		return false;
		} catch (Exception e) {
		Timber.w("Unknown error", e);
		Timber.w(e, "Unknown error");
		return false;
		}
		return true;
		@@ -2066,7 +2066,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
		}
		}
		} catch (SettingsImportExportException e) {
		Timber.w("Exception during export", e);
		Timber.w(e, "Exception during export");
		return false;
		} catch (FileNotFoundException e) {
		Timber.w("Couldn't read content from URI " + mUri);

k9mail/src/main/java/com/fsck/k9/activity/FolderList.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -813,7 +813,7 @@ public class FolderList extends K9ListActivity {
		}
		}
		} catch (Exception e) {
		Timber.e("Exception while populating folder", e);
		Timber.e(e, "Exception while populating folder");
		} finally {
		if (localFolder != null) {
		localFolder.close();