ThmmyNoLife
/
mTHMMY
mirror of https://github.com/ThmmyNoLife/mTHMMY
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add not editable file extension to filename field, various fixes

uploads
Apostolos Fanakis 6 years ago
parent
05d79890d4
commit
d7643309ac
3 changed files with 80 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
  2. 27
      app/src/main/java/gr/thmmy/mthmmy/utils/FileUtils.java
  3. 4
      app/src/main/res/values/strings.xml

69
app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
View File

@ -19,6 +19,7 @@ import android.support.v7.widget.AppCompatImageButton;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
@ -49,6 +50,7 @@ import gr.thmmy.mthmmy.base.BaseActivity;
import gr.thmmy.mthmmy.base.BaseApplication; import gr.thmmy.mthmmy.base.BaseApplication;
import gr.thmmy.mthmmy.model.UploadCategory; import gr.thmmy.mthmmy.model.UploadCategory;
import gr.thmmy.mthmmy.utils.AppCompatSpinnerWithoutDefault; import gr.thmmy.mthmmy.utils.AppCompatSpinnerWithoutDefault;
import gr.thmmy.mthmmy.utils.FileUtils;
import gr.thmmy.mthmmy.utils.TakePhoto; import gr.thmmy.mthmmy.utils.TakePhoto;
import gr.thmmy.mthmmy.utils.parsing.ParseException; import gr.thmmy.mthmmy.utils.parsing.ParseException;
import gr.thmmy.mthmmy.utils.parsing.ParseTask; import gr.thmmy.mthmmy.utils.parsing.ParseTask;
@ -238,8 +240,18 @@ public class UploadActivity extends BaseActivity {
uploadFilename = findViewById(R.id.upload_filename); uploadFilename = findViewById(R.id.upload_filename);
uploadFilename.addTextChangedListener(new TextWatcher() { uploadFilename.addTextChangedListener(new TextWatcher() {
String filenameText, fileExtension;
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
filenameText = s.toString();
if (fileUri != null) {
fileExtension = FileUtils.getFileExtension(UploadsHelper.
filenameFromUri(getApplicationContext(), fileUri));
} else {
fileExtension = null;
}
} }
@Override @Override
@ -248,8 +260,18 @@ public class UploadActivity extends BaseActivity {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
if (!s.toString().isEmpty() && if (fileExtension == null) {
!s.toString().matches("[0-9a-zA-Z~!@#$%^&()_+=\\-`\\[\\]{};',.]+")) { return;
}
if (!s.toString().endsWith(fileExtension)) {
uploadFilename.setText(filenameText);
return;
}
String filenameWithoutExtension = FileUtils.getFilenameWithoutExtension(s.toString());
if (filenameWithoutExtension != null && !filenameWithoutExtension.isEmpty() &&
!filenameWithoutExtension.matches("[0-9a-zA-Z~!@#$%^&()_+=\\-`\\[\\]{};',.]+")) {
uploadFilenameInfo.setImageResource(R.drawable.ic_info_outline_warning_24dp); uploadFilenameInfo.setImageResource(R.drawable.ic_info_outline_warning_24dp);
} else { } else {
uploadFilenameInfo.setImageResource(R.drawable.ic_info_outline_white_24dp); uploadFilenameInfo.setImageResource(R.drawable.ic_info_outline_white_24dp);
@ -316,7 +338,7 @@ public class UploadActivity extends BaseActivity {
} }
} }
//Checks settings and adds "Uploaded from mTHMMY" string to description //Checks settings and possibly adds "Uploaded from mTHMMY" string to description
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(view.getContext()); SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(view.getContext());
if (sharedPrefs.getBoolean(UPLOADING_APP_SIGNATURE_ENABLE_KEY, true)) { if (sharedPrefs.getBoolean(UPLOADING_APP_SIGNATURE_ENABLE_KEY, true)) {
uploadDescriptionText += uploadedFromThmmyPromptHtml; uploadDescriptionText += uploadedFromThmmyPromptHtml;
@ -326,7 +348,6 @@ public class UploadActivity extends BaseActivity {
{ {
String editTextFilename = uploadFilename.getText().toString(); String editTextFilename = uploadFilename.getText().toString();
String selectedFileFilename = UploadsHelper.filenameFromUri(this, fileUri); String selectedFileFilename = UploadsHelper.filenameFromUri(this, fileUri);
selectedFileFilename = selectedFileFilename.substring(0, selectedFileFilename.indexOf("."));
if (!editTextFilename.equals(selectedFileFilename)) { if (!editTextFilename.equals(selectedFileFilename)) {
//File should be uploaded with a different name //File should be uploaded with a different name
@ -334,13 +355,14 @@ public class UploadActivity extends BaseActivity {
case SELECT_FILE_METHOD_SELECTED: case SELECT_FILE_METHOD_SELECTED:
//Temporarily copies the file to a another location and renames it //Temporarily copies the file to a another location and renames it
fileUri = UploadsHelper.createTempFile(this, storage, fileUri, fileUri = UploadsHelper.createTempFile(this, storage, fileUri,
editTextFilename); FileUtils.getFilenameWithoutExtension(editTextFilename));
break; break;
case TAKE_PHOTO_METHOD_SELECTED: case TAKE_PHOTO_METHOD_SELECTED:
//Renames the photo taken //Renames the photo taken
String photoPath = photoFileSelected.getPath(); String photoPath = photoFileSelected.getPath();
photoPath = photoPath.substring(0, photoPath.lastIndexOf(File.separator)); photoPath = photoPath.substring(0, photoPath.lastIndexOf(File.separator));
String destinationFilename = photoPath + File.separator + editTextFilename + ".jpg"; String destinationFilename = photoPath + File.separator +
FileUtils.getFilenameWithoutExtension(editTextFilename) + ".jpg";
if (!storage.rename(photoFileSelected.getAbsolutePath(), destinationFilename)) { if (!storage.rename(photoFileSelected.getAbsolutePath(), destinationFilename)) {
//Something went wrong, abort //Something went wrong, abort
@ -468,14 +490,16 @@ public class UploadActivity extends BaseActivity {
//Keeps the filename between different file selections if it has been modified //Keeps the filename between different file selections if it has been modified
boolean hasCustomFilename = false; boolean hasCustomFilename = false;
{ {
String editTextFilename = uploadFilename.getText().toString(); String editTextFilename = FileUtils.
getFilenameWithoutExtension(uploadFilename.getText().toString());
String previousFilename = ""; String previousFilename = "";
if (fileUri != null) { if (fileUri != null) {
previousFilename = UploadsHelper.filenameFromUri(this, fileUri); previousFilename = FileUtils.
previousFilename = previousFilename.substring(0, previousFilename.indexOf(".")); getFilenameWithoutExtension(UploadsHelper.filenameFromUri(this, fileUri));
} }
if (!editTextFilename.isEmpty() && !editTextFilename.equals(previousFilename)) { if (editTextFilename != null && !editTextFilename.isEmpty() &&
!editTextFilename.equals(previousFilename)) {
hasCustomFilename = true; hasCustomFilename = true;
} }
} }
@ -493,7 +517,7 @@ public class UploadActivity extends BaseActivity {
if (fileUri != null) { if (fileUri != null) {
String filename = UploadsHelper.filenameFromUri(this, fileUri); String filename = UploadsHelper.filenameFromUri(this, fileUri);
if (!hasCustomFilename) { if (!hasCustomFilename) {
uploadFilename.setText(filename.substring(0, filename.indexOf("."))); uploadFilename.setText(filename);
} }
filename = filename.toLowerCase(); filename = filename.toLowerCase();
@ -527,14 +551,16 @@ public class UploadActivity extends BaseActivity {
//Keeps the filename between different file selections if it has been modified //Keeps the filename between different file selections if it has been modified
boolean hasCustomFilename = false; boolean hasCustomFilename = false;
{ {
String editTextFilename = uploadFilename.getText().toString(); String editTextFilename = FileUtils.
getFilenameWithoutExtension(uploadFilename.getText().toString());
String previousFilename = ""; String previousFilename = "";
if (fileUri != null) { if (fileUri != null) {
previousFilename = UploadsHelper.filenameFromUri(this, fileUri); previousFilename = FileUtils.
previousFilename = previousFilename.substring(0, previousFilename.indexOf(".")); getFilenameWithoutExtension(UploadsHelper.filenameFromUri(this, fileUri));
} }
if (!editTextFilename.isEmpty() && !editTextFilename.equals(previousFilename)) { if (editTextFilename != null && !editTextFilename.isEmpty() &&
!editTextFilename.equals(previousFilename)) {
hasCustomFilename = true; hasCustomFilename = true;
} }
} }
@ -547,8 +573,7 @@ public class UploadActivity extends BaseActivity {
fileUri = TakePhoto.processResult(this, photoFileSelected); fileUri = TakePhoto.processResult(this, photoFileSelected);
if (!hasCustomFilename) { if (!hasCustomFilename) {
uploadFilename.setText(photoFileSelected.getName(). uploadFilename.setText(photoFileSelected.getName());
substring(0, photoFileSelected.getName().indexOf(".")));
} }
fileIcon = "jpg_image.gif"; fileIcon = "jpg_image.gif";
} else if (requestCode == AFR_REQUEST_CODE_FIELDS_BUILDER) { } else if (requestCode == AFR_REQUEST_CODE_FIELDS_BUILDER) {
@ -556,8 +581,16 @@ public class UploadActivity extends BaseActivity {
return; return;
} }
String previousName = uploadFilename.getText().toString();
if (previousName.isEmpty()) {
uploadFilename.setText(data.getStringExtra(RESULT_FILENAME));
} else {
String filenameWithExtension = data.getStringExtra(RESULT_FILENAME) +
FileUtils.getFileExtension(previousName);
uploadFilename.setText(filenameWithExtension);
}
uploadTitle.setText(data.getStringExtra(RESULT_TITLE)); uploadTitle.setText(data.getStringExtra(RESULT_TITLE));
uploadFilename.setText(data.getStringExtra(RESULT_FILENAME));
uploadDescription.setText(data.getStringExtra(RESULT_DESCRIPTION)); uploadDescription.setText(data.getStringExtra(RESULT_DESCRIPTION));
} else { } else {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);

27
app/src/main/java/gr/thmmy/mthmmy/utils/FileUtils.java
View File

@ -1,6 +1,7 @@
package gr.thmmy.mthmmy.utils; package gr.thmmy.mthmmy.utils;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import java.io.File; import java.io.File;
@ -20,7 +21,31 @@ public class FileUtils {
return type; return type;
} }
public static boolean fileNameExists (String fileName) { public static boolean fileNameExists(String fileName) {
return fileName != null && (new File(SAVE_DIR.getAbsolutePath(), fileName)).isFile(); return fileName != null && (new File(SAVE_DIR.getAbsolutePath(), fileName)).isFile();
} }
@Nullable
public static String getFileExtension(String filename) {
String fileExtension;
if (!filename.contains(".")) {
return null;
}
if (filename.toLowerCase().endsWith(".tar.gz")) {
fileExtension = filename.substring(filename.length() - 7);
} else {
fileExtension = filename.substring(filename.lastIndexOf("."));
}
return fileExtension;
}
public static String getFilenameWithoutExtension(String filename) {
String fileExtension = getFileExtension(filename);
return fileExtension == null
? null
: filename.substring(0, filename.indexOf(fileExtension));
}
} }

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

@ -121,7 +121,9 @@
<string name="upload_select_file">Select file</string> <string name="upload_select_file">Select file</string>
<string name="upload_take_photo">Take photo</string> <string name="upload_take_photo">Take photo</string>
<string name="upload_spinners_hint">Select a category</string> <string name="upload_spinners_hint">Select a category</string>
<string name="upload_filename_info">Please follow the filename rules described in <a href="https://www.thmmy.gr/smf/index.php?topic=34294.0">this topic</a>.</string> <string name="upload_filename_info">Please follow the filename rules as\ndescribed
in&#160;<a href="https://www.thmmy.gr/smf/index.php?topic=34294.0">this topic</a>.\n
\nThis does not rename your local files.</string>
<!--Upload Fields Builder Activity--> <!--Upload Fields Builder Activity-->
<string name="upload_fields_builder_type_radio_buttons_title">Select type of upload</string> <string name="upload_fields_builder_type_radio_buttons_title">Select type of upload</string>

Write Preview
Loading…
Cancel
Save