Code style fixes (35c8ef2a) · Commits · e / os / Mail

k9mail-library/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -345,8 +345,7 @@ public class TrustManagerFactoryTest {

		// reload store from empty file
		if (mKeyStoreFile.exists() && !mKeyStoreFile.delete()) {
		throw new RuntimeException("Unable to delete key store file: "
		+ mKeyStoreFile.getAbsolutePath());
		throw new RuntimeException("Unable to delete key store file: " + mKeyStoreFile.getAbsolutePath());
		}
		mKeyStore.setKeyStoreFile(mKeyStoreFile);
		assertFalse(mKeyStore.isValidCertificate(mCert1, MATCHING_HOST, PORT1));

+4 −4

Original line number	Diff line number	Diff line
		@@ -178,9 +178,9 @@ public class LocalKeyStore {
		private void upgradeKeyStoreFile() throws CertificateException {
		if (KEY_STORE_FILE_VERSION > 0) {
		// Blow away version "0" because certificate aliases have changed.
		File v0 = new File(getKeyStoreFilePath(0));
		if (v0.exists() && !v0.delete()) {
		Log.d(LOG_TAG, "Failed to delete old key-store file: " + v0.getAbsolutePath());
		File versionZeroFile = new File(getKeyStoreFilePath(0));
		if (versionZeroFile.exists() && !versionZeroFile.delete()) {
		Log.d(LOG_TAG, "Failed to delete old key-store file: " + versionZeroFile.getAbsolutePath());
		}
		}
		}

+11 −9

Original line number	Diff line number	Diff line
		@@ -89,9 +89,9 @@ public class FileHelper {
		Log.d(K9.LOG_TAG, "Unable to delete file: " + to.getAbsolutePath());
		}
		}

		if (!to.getParentFile().mkdirs()) {
		Log.d(K9.LOG_TAG, "Unable to make directories: "
		+ to.getParentFile().getAbsolutePath());
		Log.d(K9.LOG_TAG, "Unable to make directories: " + to.getParentFile().getAbsolutePath());
		}

		try {
		@@ -110,6 +110,7 @@ public class FileHelper {
		} finally {
		try { in.close(); } catch (Throwable ignore) {}
		}

		if (!from.delete()) {
		Log.d(K9.LOG_TAG, "Unable to delete file: " + from.getAbsolutePath());
		}
		@@ -151,8 +152,9 @@ public class FileHelper {
		for (File file : files) {
		if (file.isDirectory()) {
		moveRecursive(file, new File(toDir, file.getName()));
		if(!file.delete())
		if (!file.delete()) {
		Log.d(K9.LOG_TAG, "Unable to delete file: " + toDir.getAbsolutePath());
		}
		} else {
		File target = new File(toDir, file.getName());
		if (!file.renameTo(target)) {

+5 −5

Original line number	Diff line number	Diff line
		@@ -168,10 +168,10 @@ class MigrationTo51 {
		Log.d(K9.LOG_TAG, "Failed to delete stale attachement file: " + file.getAbsolutePath());
		}
		}

		Log.d(K9.LOG_TAG, "deleting old attachment directory");
		if (attachmentDirOld.exists() && !attachmentDirOld.delete()) {
		Log.d(K9.LOG_TAG, "Failed to delete old attachement directory: "
		+attachmentDirOld.getAbsolutePath());
		Log.d(K9.LOG_TAG, "Failed to delete old attachement directory: " + attachmentDirOld.getAbsolutePath());
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -84,11 +84,11 @@ public class SettingsExporter {
		String filename = null;
		try
		{
		File dir = new File(Environment.getExternalStorageDirectory() + File.separator
		+ context.getPackageName());
		File dir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getPackageName());
		if (!dir.mkdirs()) {
		Log.d(K9.LOG_TAG, "Unable to create directory: " + dir.getAbsolutePath());
		}

		File file = FileHelper.createUniqueFile(dir, EXPORT_FILENAME);
		filename = file.getAbsolutePath();
		os = new FileOutputStream(filename);

+2 −2

File changed.

Contains only whitespace changes.