karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Codename: rename methods to FileUtils.getPath and FileUtils.getPathDisplayName

Browse Source
This commit is contained in:
Jimmy Shih
2013-10-04 15:30:53 -07:00
parent 5f00430795
commit 4161f8ff56
14 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+1 -1
View File
@@ -395,7 +395,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
}
File dir = new File(
FileUtils.getDirectoryPath(FileUtils.PICTURES_DIR, Long.toString(trackId)));
FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(trackId)));
FileUtils.ensureDirectoryExists(dir);
String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class ExportDialogFragment extends DialogFragment {
*/
private void setExternalStorageOption(RadioButton radioButton, TrackFileFormat trackFileFormat) {
radioButton.setText(getString(R.string.export_external_storage_option, trackFileFormat.name(),
FileUtils.getDirectoryDisplayName(trackFileFormat.getExtension())));
FileUtils.getPathDisplayName(trackFileFormat.getExtension())));
}
/**
MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class FileTypeDialogFragment extends DialogFragment {
for (int i = 0; i < choices.length; i++) {
TrackFileFormat trackFileFormat = trackFileFormats[i];
choices[i] = getString(optionId, trackFileFormat.name(),
FileUtils.getDirectoryDisplayName(trackFileFormat.getExtension()));
FileUtils.getPathDisplayName(trackFileFormat.getExtension()));
}
return new AlertDialog.Builder(getActivity()).setNegativeButton(R.string.generic_cancel, null)
.setPositiveButton(R.string.generic_ok, new OnClickListener() {
MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+1 -1
View File
@@ -86,7 +86,7 @@ class ExternalFileBackup {
* @param create whether to try creating the directory if it doesn't exist
*/
private File getBackupsDirectory(boolean create) {
String directoryPath = FileUtils.getDirectoryPath(FileUtils.BACKUPS_DIR);
String directoryPath = FileUtils.getPath(FileUtils.BACKUPS_DIR);
final File dir = new File(directoryPath);
Log.d(TAG, "Dir: " + dir.getAbsolutePath());
if (create) {
MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class RestoreChooserActivity extends Activity {
*/
private void showNoBackupMessage() {
String message = getString(R.string.settings_backup_restore_no_backups,
FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR));
FileUtils.getPathDisplayName(FileUtils.BACKUPS_DIR));
Toast.makeText(this, message, Toast.LENGTH_LONG).show();
}
}
MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
+2 -2
View File
@@ -82,7 +82,7 @@ public class SaveActivity extends Activity {
}
File directory = playTrack ? getCacheDir()
: new File(FileUtils.getDirectoryPath(trackFileFormat.getExtension()));
: new File(FileUtils.getPath(trackFileFormat.getExtension()));
if (!FileUtils.ensureDirectoryExists(directory)) {
Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
finish();
@@ -96,7 +96,7 @@ public class SaveActivity extends Activity {
}
directoryDisplayName = playTrack ? getCacheDir().getName()
: FileUtils.getDirectoryDisplayName(trackFileFormat.getExtension());
: FileUtils.getPathDisplayName(trackFileFormat.getExtension());
Object retained = getLastNonConfigurationInstance();
if (retained instanceof SaveAsyncTask) {
MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
+1 -1
View File
@@ -470,7 +470,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
if (importTrackId == -1L) {
return null;
}
return FileUtils.getDirectoryPath(
return FileUtils.getPath(
FileUtils.PICTURES_DIR, Long.toString(importTrackId), fileName);
}
MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
+2 -2
View File
@@ -89,9 +89,9 @@ public class ImportActivity extends Activity {
}
String directoryPath;
if (importAll) {
directoryDisplayName = FileUtils.getDirectoryDisplayName(
directoryDisplayName = FileUtils.getPathDisplayName(
trackFileFormat.getExtension());
directoryPath = FileUtils.getDirectoryPath(trackFileFormat.getExtension());
directoryPath = FileUtils.getPath(trackFileFormat.getExtension());
if (!FileUtils.isDirectory(new File(directoryPath))) {
Toast.makeText(
this, getString(R.string.import_no_directory, directoryDisplayName), Toast.LENGTH_LONG)
MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
+2 -2
View File
@@ -116,7 +116,7 @@ public class KmzTrackImporter implements TrackImporter {
if (importTrackId != -1L) {
File dir = new File(
FileUtils.getDirectoryPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
if (dir.exists() && dir.isDirectory()) {
for (File file : dir.listFiles()) {
file.delete();
@@ -180,7 +180,7 @@ public class KmzTrackImporter implements TrackImporter {
return;
}
File dir = new File(
FileUtils.getDirectoryPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
FileUtils.ensureDirectoryExists(dir);
fileOutputStream = new FileOutputStream(new File(dir, fileName));
MyTracks/src/com/google/android/apps/mytracks/settings/BackupResetSettingsActivity.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class BackupResetSettingsActivity extends AbstractSettingsActivity {
switch (id) {
case DIALOG_CONFIRM_BACKUP_ID:
message = getString(R.string.settings_backup_confirm_message,
FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR));
FileUtils.getPathDisplayName(FileUtils.BACKUPS_DIR));
dialog = DialogUtils.createConfirmationDialog(this, R.string.settings_backup_confirm_title,
message, new DialogInterface.OnClickListener() {
@Override
MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+5 -5
View File
@@ -88,11 +88,11 @@ public class FileUtils {
}
/**
* Gets the directory display name.
* Gets the display name for a path on the external storage.
*
* @param components the components
*/
public static String getDirectoryDisplayName(String... components) {
public static String getPathDisplayName(String... components) {
StringBuilder dirNameBuilder = new StringBuilder();
dirNameBuilder.append(File.separatorChar);
dirNameBuilder.append(SDCARD_TOP_DIR);
@@ -103,14 +103,14 @@ public class FileUtils {
return dirNameBuilder.toString();
}
/**
* Gets the directory path.
* Gets a path on the external storage.
*
* @param components the components
*/
public static String getDirectoryPath(String... components) {
public static String getPath(String... components) {
StringBuilder dirNameBuilder = new StringBuilder();
dirNameBuilder.append(Environment.getExternalStorageDirectory());
dirNameBuilder.append(getDirectoryDisplayName(components));
dirNameBuilder.append(getPathDisplayName(components));
return dirNameBuilder.toString();
}
MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
+2 -2
View File
@@ -29,13 +29,13 @@ import junit.framework.TestCase;
public class FileUtilsTest extends TestCase {
/**
* Tests {@link FileUtils#getDirectoryPath(String...)}.
* Tests {@link FileUtils#getPath(String...)}.
*/
public void testBuildExternalDirectoryPath() {
String expectedName = Environment.getExternalStorageDirectory() + File.separator
+ FileUtils.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator
+ "c";
String dirName = FileUtils.getDirectoryPath("a", "b", "c");
String dirName = FileUtils.getPath("a", "b", "c");
assertEquals(expectedName, dirName);
}
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+2 -2
View File
@@ -501,7 +501,7 @@ public class EndToEndTestUtils {
* @param trackKind the kind of track
*/
public static void deleteExportedFiles(String trackKind) {
File[] allFiles = (new File(FileUtils.getDirectoryPath(trackKind.toLowerCase()))).listFiles();
File[] allFiles = (new File(FileUtils.getPath(trackKind.toLowerCase()))).listFiles();
if (allFiles != null) {
for (File oneFile : allFiles) {
oneFile.delete();
@@ -528,7 +528,7 @@ public class EndToEndTestUtils {
* @return files array of such kind of exported tracks
*/
public static File[] getExportedFiles(final String trackKind) {
String directoryPath = FileUtils.getDirectoryPath(trackKind);
String directoryPath = FileUtils.getPath(trackKind);
FileFilter filter = new FileFilter() {
@Override
public boolean accept(File pathname) {
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java
+4 -4
View File
@@ -264,20 +264,20 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
private String getSaveSuccessMessage(int count, String type) {
String tracks = activityMyTracks.getResources().getQuantityString(R.plurals.tracks, count,
count);
String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
String directoryDisplayName = FileUtils.getPathDisplayName(type);
return activityMyTracks.getString(R.string.export_external_storage_success, tracks,
directoryDisplayName);
}
private String getImportSuccessMessage(int count, String type) {
String files = activityMyTracks.getResources().getQuantityString(R.plurals.files, count, count);
String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
String directoryDisplayName = FileUtils.getPathDisplayName(type);
return activityMyTracks.getString(R.string.import_success, files, directoryDisplayName);
}
private String getImportErrorMessage(int count, int total, String type) {
String files = activityMyTracks.getResources().getQuantityString(R.plurals.files, total, total);
String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
String directoryDisplayName = FileUtils.getPathDisplayName(type);
return activityMyTracks.getString(R.string.import_error, count, files, directoryDisplayName);
}
@@ -481,7 +481,7 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
+ "</trkseg> " + "</trk> " + "</gpx>";
try {
File file = new File(FileUtils.getDirectoryPath(EndToEndTestUtils.GPX.toLowerCase())
File file = new File(FileUtils.getPath(EndToEndTestUtils.GPX.toLowerCase())
+ File.separator + fileName);
FileOutputStream fop = new FileOutputStream(file);
// if file doesnt exists, then create it