ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle attachment filenames with % characters

Browse Source 
b/14571903

Change-Id: I3296bebfb4c6902750c68c9d3fb79ce644dbb137
This commit is contained in:
Tony Mantler 2014-05-06 10:26:45 -07:00
parent ddfdb5d11d
commit 9a80ffce14
2 changed files with 147 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
emailcommon/src/com/android/emailcommon/utility/Utility.java
View File

@ -480,27 +480,29 @@ public class Utility {
return createUniqueFileInternal(NewFileCreator.DEFAULT, directory, filename);
}
/* package */ static File createUniqueFileInternal(NewFileCreator nfc,
File directory, String filename) throws IOException {
File file = new File(directory, filename);
/* package */ static File createUniqueFileInternal(final NewFileCreator nfc,
final File directory, final String filename) throws IOException {
final File file = new File(directory, filename);
if (nfc.createNewFile(file)) {
return file;
}
// Get the extension of the file, if any.
int index = filename.lastIndexOf('.');
String format;
final int index = filename.lastIndexOf('.');
final String name;
final String extension;
if (index != -1) {
String name = filename.substring(0, index);
String extension = filename.substring(index);
format = name + "-%d" + extension;
name = filename.substring(0, index);
extension = filename.substring(index);
} else {
format = filename + "-%d";
name = filename;
extension = "";
}
for (int i = 2; i < Integer.MAX_VALUE; i++) {
file = new File(directory, String.format(format, i));
if (nfc.createNewFile(file)) {
return file;
final File numberedFile =
new File(directory, name + "-" + Integer.toString(i) + extension);
if (nfc.createNewFile(numberedFile)) {
return numberedFile;
}
}
return null;

135
tests/src/com/android/emailcommon/utility/UtilityTest.java
View File

@ -16,15 +16,23 @@
package com.android.emailcommon.utility;
import android.test.AndroidTestCase;
import android.test.IsolatedContext;
import android.test.mock.MockContentResolver;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.TextUtils;
import com.android.emailcommon.utility.Utility.NewFileCreator;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
import junit.framework.TestCase;
@SmallTest
public class UtilityTest extends TestCase {
public class UtilityTest extends AndroidTestCase {
private void testParseDateTimesHelper(String date, int year, int month,
int day, int hour, int minute, int second) throws Exception {
GregorianCalendar cal = Utility.parseDateTimeToCalendar(date);
@ -72,4 +80,127 @@ public class UtilityTest extends TestCase {
// expected
}
}
private static NewFileCreator getCountdownFileCreator() {
return new NewFileCreator() {
private int mCountdown = 5;
@Override
public boolean createNewFile(File f) throws IOException {
return mCountdown-- <= 0;
}
};
}
private static NewFileCreator getTrueFileCreator() {
return new NewFileCreator() {
@Override
public boolean createNewFile(File f) throws IOException {
return true;
}
};
}
@SmallTest
public void testCreateUniqueFileCompare() throws Exception {
final File directory =
new IsolatedContext(new MockContentResolver(), getContext()).getFilesDir();
final File created1 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, "file");
assertNotNull(created1);
assertFalse(TextUtils.equals(created1.getName(), "file"));
final File created2 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file");
assertNotNull(created2);
assertTrue(TextUtils.equals(created2.getName(), "file"));
final File created3 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, "file.ext");
assertNotNull(created3);
assertFalse(TextUtils.equals(created3.getName(), "file.ext"));
final File created4 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file.ext");
assertNotNull(created4);
assertTrue(TextUtils.equals(created4.getName(), "file.ext"));
}
@SmallTest
public void testCreateUniqueFileWithPercent() throws Exception {
final File directory =
new IsolatedContext(new MockContentResolver(), getContext()).getFilesDir();
final File created1 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file%s");
assertNotNull(created1);
final File created2 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file%s.ext");
assertNotNull(created2);
}
@SmallTest
public void testCreateUniqueFile() throws Exception {
final File directory =
new IsolatedContext(new MockContentResolver(), getContext()).getFilesDir();
final File created1 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file");
assertNotNull(created1);
final File created2 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, "file");
assertNotNull(created2);
final File created3 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file.ext");
assertNotNull(created3);
final File created4 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, "file.ext");
assertNotNull(created4);
final File created5 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, ".ext");
assertNotNull(created5);
final File created6 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, ".ext");
assertNotNull(created6);
final File created7 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, ".");
assertNotNull(created7);
final File created8 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, ".");
assertNotNull(created8);
}
@SmallTest
public void testCreateUniqueFileExtensions() throws Exception {
final File directory =
new IsolatedContext(new MockContentResolver(), getContext()).getFilesDir();
final File created1 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file");
assertNotNull(created1);
assertEquals(created1.getName().indexOf('.'), -1);
final File created2 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, "file");
assertNotNull(created2);
assertEquals(created2.getName().indexOf('.'), -1);
final File created3 =
Utility.createUniqueFileInternal(getTrueFileCreator(), directory, "file.ext");
assertNotNull(created3);
assertEquals(created3.getName().length() - created3.getName().lastIndexOf('.'), 4);
final File created4 =
Utility.createUniqueFileInternal(getCountdownFileCreator(), directory, "file.ext");
assertNotNull(created4);
assertEquals(created4.getName().length() - created4.getName().lastIndexOf('.'), 4);
}
}