fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reformat the rename conditions a bit

This commit is contained in:
tibbi 2016-03-26 15:37:12 +01:00
parent 5c144a607b
commit 1da4050d4a
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
View File

@ -242,18 +242,19 @@ public class MainActivity extends AppCompatActivity
public void onClick(View v) {
final String newDirName = dirNameET.getText().toString().trim();
if (!newDirName.isEmpty()) {
final File newDir = new File(dir.getParent(), newDirName);
if (newDirName.isEmpty()) {
Utils.showToast(getApplicationContext(), R.string.rename_folder_empty);
return;
}
if (dir.renameTo(newDir)) {
Utils.showToast(getApplicationContext(), R.string.rename_folder_ok);
alertDialog.dismiss();
actionMode.finish();
final String[] newDirPath = new String[]{newDir.getAbsolutePath()};
MediaScannerConnection.scanFile(getApplicationContext(), newDirPath, null, MainActivity.this);
} else {
Utils.showToast(getApplicationContext(), R.string.rename_folder_error);
}
final File newDir = new File(dir.getParent(), newDirName);
if (dir.renameTo(newDir)) {
Utils.showToast(getApplicationContext(), R.string.rename_folder_ok);
alertDialog.dismiss();
actionMode.finish();
final String[] newDirPath = new String[]{newDir.getAbsolutePath()};
MediaScannerConnection.scanFile(getApplicationContext(), newDirPath, null, MainActivity.this);
} else {
Utils.showToast(getApplicationContext(), R.string.rename_folder_error);
}

23
app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
View File

@ -195,19 +195,20 @@ public class ViewPagerActivity extends AppCompatActivity
final String fileName = fileNameET.getText().toString().trim();
final String extension = extensionET.getText().toString().trim();
if (!fileName.isEmpty() && !extension.isEmpty()) {
final File newFile = new File(file.getParent(), fileName + "." + extension);
if (fileName.isEmpty() || extension.isEmpty()) {
Utils.showToast(getApplicationContext(), R.string.rename_file_empty);
return;
}
if (file.renameTo(newFile)) {
photos.set(pager.getCurrentItem(), newFile.getAbsolutePath());
final File newFile = new File(file.getParent(), fileName + "." + extension);
final String[] changedFiles = {file.getAbsolutePath(), newFile.getAbsolutePath()};
MediaScannerConnection.scanFile(getApplicationContext(), changedFiles, null, null);
updateActionbarTitle();
alertDialog.dismiss();
} else {
Utils.showToast(getApplicationContext(), R.string.rename_file_error);
}
if (file.renameTo(newFile)) {
photos.set(pager.getCurrentItem(), newFile.getAbsolutePath());
final String[] changedFiles = {file.getAbsolutePath(), newFile.getAbsolutePath()};
MediaScannerConnection.scanFile(getApplicationContext(), changedFiles, null, null);
updateActionbarTitle();
alertDialog.dismiss();
} else {
Utils.showToast(getApplicationContext(), R.string.rename_file_error);
}

2
app/src/main/res/values/strings.xml
View File

@ -9,7 +9,9 @@
<string name="rename_file">Rename file</string>
<string name="rename_folder">Rename folder</string>
<string name="rename_file_error">Could not rename the file</string>
<string name="rename_file_empty">File name must not be empty</string>
<string name="rename_folder_error">Could not rename the folder</string>
<string name="rename_folder_empty">Folder name must not be empty</string>
<string name="rename_folder_ok">Folder renamed successfully</string>
<string name="file_name">File name</string>
<string name="folder_name">Folder name</string>