|
|
@ -1,54 +1,68 @@ |
|
|
package gr.thmmy.mthmmy.activities.upload; |
|
|
package gr.thmmy.mthmmy.activities.upload; |
|
|
|
|
|
|
|
|
import android.app.Activity; |
|
|
import android.app.Activity; |
|
|
|
|
|
import android.app.PendingIntent; |
|
|
import android.content.Context; |
|
|
import android.content.Context; |
|
|
import android.content.Intent; |
|
|
import android.content.Intent; |
|
|
import android.content.SharedPreferences; |
|
|
import android.content.SharedPreferences; |
|
|
import android.content.pm.ResolveInfo; |
|
|
import android.content.pm.PackageManager; |
|
|
import android.graphics.Bitmap; |
|
|
import android.graphics.Typeface; |
|
|
import android.graphics.drawable.Drawable; |
|
|
import android.graphics.drawable.Drawable; |
|
|
import android.net.Uri; |
|
|
import android.net.Uri; |
|
|
import android.os.AsyncTask; |
|
|
import android.os.AsyncTask; |
|
|
|
|
|
import android.os.Build; |
|
|
import android.os.Bundle; |
|
|
import android.os.Bundle; |
|
|
import android.provider.MediaStore; |
|
|
import androidx.annotation.NonNull; |
|
|
|
|
|
import com.google.android.material.floatingactionbutton.FloatingActionButton; |
|
|
|
|
|
import androidx.core.content.FileProvider; |
|
|
|
|
|
import androidx.appcompat.app.AlertDialog; |
|
|
|
|
|
import androidx.appcompat.content.res.AppCompatResources; |
|
|
|
|
|
import androidx.preference.PreferenceManager; |
|
|
|
|
|
import androidx.appcompat.widget.AppCompatButton; |
|
|
|
|
|
import androidx.appcompat.widget.AppCompatImageButton; |
|
|
|
|
|
import android.text.Editable; |
|
|
|
|
|
import android.text.Spannable; |
|
|
|
|
|
import android.text.TextWatcher; |
|
|
|
|
|
import android.text.method.LinkMovementMethod; |
|
|
|
|
|
import android.text.style.ForegroundColorSpan; |
|
|
|
|
|
import android.view.ContextThemeWrapper; |
|
|
|
|
|
import android.view.LayoutInflater; |
|
|
import android.view.View; |
|
|
import android.view.View; |
|
|
import android.widget.AdapterView; |
|
|
import android.widget.AdapterView; |
|
|
import android.widget.ArrayAdapter; |
|
|
import android.widget.ArrayAdapter; |
|
|
import android.widget.EditText; |
|
|
import android.widget.EditText; |
|
|
import android.widget.LinearLayout; |
|
|
import android.widget.LinearLayout; |
|
|
|
|
|
import android.widget.PopupWindow; |
|
|
import android.widget.ProgressBar; |
|
|
import android.widget.ProgressBar; |
|
|
|
|
|
import android.widget.TextView; |
|
|
import android.widget.Toast; |
|
|
import android.widget.Toast; |
|
|
|
|
|
|
|
|
import com.google.android.material.floatingactionbutton.FloatingActionButton; |
|
|
|
|
|
|
|
|
|
|
|
import net.gotev.uploadservice.MultipartUploadRequest; |
|
|
import net.gotev.uploadservice.MultipartUploadRequest; |
|
|
import net.gotev.uploadservice.ServerResponse; |
|
|
import net.gotev.uploadservice.UploadNotificationAction; |
|
|
import net.gotev.uploadservice.UploadInfo; |
|
|
|
|
|
import net.gotev.uploadservice.UploadNotificationConfig; |
|
|
import net.gotev.uploadservice.UploadNotificationConfig; |
|
|
import net.gotev.uploadservice.UploadStatusDelegate; |
|
|
|
|
|
|
|
|
|
|
|
import org.jsoup.nodes.Document; |
|
|
import org.jsoup.nodes.Document; |
|
|
import org.jsoup.nodes.Element; |
|
|
import org.jsoup.nodes.Element; |
|
|
import org.jsoup.select.Elements; |
|
|
import org.jsoup.select.Elements; |
|
|
|
|
|
|
|
|
import java.io.File; |
|
|
import java.io.File; |
|
|
import java.io.FileOutputStream; |
|
|
import java.lang.ref.WeakReference; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
import java.util.Arrays; |
|
|
import java.util.Arrays; |
|
|
import java.util.Date; |
|
|
import java.util.Date; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Locale; |
|
|
import java.util.Locale; |
|
|
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
|
|
import androidx.appcompat.content.res.AppCompatResources; |
|
|
|
|
|
import androidx.appcompat.widget.AppCompatButton; |
|
|
|
|
|
import androidx.appcompat.widget.AppCompatTextView; |
|
|
|
|
|
import androidx.preference.PreferenceManager; |
|
|
|
|
|
import gr.thmmy.mthmmy.R; |
|
|
import gr.thmmy.mthmmy.R; |
|
|
import gr.thmmy.mthmmy.base.BaseActivity; |
|
|
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.model.UploadFile; |
|
|
|
|
|
import gr.thmmy.mthmmy.services.UploadsReceiver; |
|
|
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.parsing.ParseException; |
|
|
import gr.thmmy.mthmmy.utils.parsing.ParseException; |
|
|
import gr.thmmy.mthmmy.utils.parsing.ParseTask; |
|
|
import gr.thmmy.mthmmy.utils.parsing.ParseTask; |
|
|
import me.zhanghai.android.materialprogressbar.MaterialProgressBar; |
|
|
import me.zhanghai.android.materialprogressbar.MaterialProgressBar; |
|
|
@ -60,6 +74,7 @@ import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.BUND |
|
|
import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.RESULT_DESCRIPTION; |
|
|
import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.RESULT_DESCRIPTION; |
|
|
import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.RESULT_FILENAME; |
|
|
import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.RESULT_FILENAME; |
|
|
import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.RESULT_TITLE; |
|
|
import static gr.thmmy.mthmmy.activities.upload.UploadFieldsBuilderActivity.RESULT_TITLE; |
|
|
|
|
|
import static gr.thmmy.mthmmy.utils.FileUtils.faIconFromFilename; |
|
|
|
|
|
|
|
|
public class UploadActivity extends BaseActivity { |
|
|
public class UploadActivity extends BaseActivity { |
|
|
/** |
|
|
/** |
|
|
@ -71,27 +86,40 @@ public class UploadActivity extends BaseActivity { |
|
|
/** |
|
|
/** |
|
|
* Request codes used in activities for result (AFR) calls |
|
|
* Request codes used in activities for result (AFR) calls |
|
|
*/ |
|
|
*/ |
|
|
private static final int AFR_REQUEST_CODE_CHOOSE_FILE = 8; |
|
|
private static final int AFR_REQUEST_CODE_CHOOSE_FILE = 8; //Arbitrary, application specific
|
|
|
private static final int AFR_REQUEST_CODE_CAMERA = 4; |
|
|
private static final int AFR_REQUEST_CODE_CAMERA = 4; //Arbitrary, application specific
|
|
|
private static final int AFR_REQUEST_CODE_FIELDS_BUILDER = 74; |
|
|
private static final int AFR_REQUEST_CODE_FIELDS_BUILDER = 74; //Arbitrary, application specific
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Request code to gain read/write permission |
|
|
|
|
|
*/ |
|
|
|
|
|
private static final int UPLOAD_REQUEST_CODE = 42; //Arbitrary, application specific
|
|
|
|
|
|
|
|
|
|
|
|
private static final int MAX_FILE_SIZE_SUPPORTED = 45000000; |
|
|
|
|
|
|
|
|
|
|
|
//private UploadsReceiver uploadsReceiver = new UploadsReceiver();
|
|
|
private ArrayList<UploadCategory> uploadRootCategories = new ArrayList<>(); |
|
|
private ArrayList<UploadCategory> uploadRootCategories = new ArrayList<>(); |
|
|
private ParseUploadPageTask parseUploadPageTask; |
|
|
private ParseUploadPageTask parseUploadPageTask; |
|
|
private ArrayList<String> bundleCategory; |
|
|
private ArrayList<String> bundleCategory; |
|
|
private String categorySelected = "-1"; |
|
|
private String categorySelected = "-1"; |
|
|
private String uploaderProfileIndex = "1"; |
|
|
private String uploaderProfileIndex = "1"; |
|
|
private String uploadFilename; |
|
|
|
|
|
private Uri fileUri; |
|
|
private ArrayList<UploadFile> filesList = new ArrayList<>(); |
|
|
|
|
|
private File photoFileCreated = null; |
|
|
private String fileIcon; |
|
|
private String fileIcon; |
|
|
|
|
|
private AppCompatImageButton uploadFilenameInfo; |
|
|
|
|
|
private CustomTextWatcher textWatcher; |
|
|
|
|
|
private boolean hasModifiedFilename = false; |
|
|
|
|
|
|
|
|
//UI elements
|
|
|
//UI elements
|
|
|
private MaterialProgressBar progressBar; |
|
|
private MaterialProgressBar progressBar; |
|
|
private LinearLayout categoriesSpinners; |
|
|
private LinearLayout categoriesSpinners; |
|
|
private AppCompatSpinnerWithoutDefault rootCategorySpinner; |
|
|
private AppCompatSpinnerWithoutDefault rootCategorySpinner; |
|
|
private EditText uploadTitle; |
|
|
private EditText uploadTitle; |
|
|
|
|
|
private EditText uploadFilename; |
|
|
private EditText uploadDescription; |
|
|
private EditText uploadDescription; |
|
|
private AppCompatButton titleDescriptionBuilderButton; |
|
|
private AppCompatButton titleDescriptionBuilderButton; |
|
|
private AppCompatTextView filenameHolder; |
|
|
private LinearLayout filesListView; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
protected void onCreate(Bundle savedInstanceState) { |
|
|
protected void onCreate(Bundle savedInstanceState) { |
|
|
@ -197,9 +225,36 @@ public class UploadActivity extends BaseActivity { |
|
|
uploadTitle = findViewById(R.id.upload_title); |
|
|
uploadTitle = findViewById(R.id.upload_title); |
|
|
uploadDescription = findViewById(R.id.upload_description); |
|
|
uploadDescription = findViewById(R.id.upload_description); |
|
|
|
|
|
|
|
|
filenameHolder = findViewById(R.id.upload_filename); |
|
|
uploadFilenameInfo = findViewById(R.id.upload_filename_info); |
|
|
Drawable filenameDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_attach_file_white_24dp); |
|
|
uploadFilenameInfo.setOnClickListener(view -> { |
|
|
filenameHolder.setCompoundDrawablesRelativeWithIntrinsicBounds(filenameDrawable, null, null, null); |
|
|
//Inflates the popup menu content
|
|
|
|
|
|
LayoutInflater layoutInflater = (LayoutInflater) view.getContext(). |
|
|
|
|
|
getSystemService(Context.LAYOUT_INFLATER_SERVICE); |
|
|
|
|
|
if (layoutInflater == null) { |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Context wrapper = new ContextThemeWrapper(this, R.style.PopupWindow); |
|
|
|
|
|
View popUpContent = layoutInflater.inflate(R.layout.activity_upload_filename_info_popup, null); |
|
|
|
|
|
|
|
|
|
|
|
//Creates the PopupWindow
|
|
|
|
|
|
PopupWindow popUp = new PopupWindow(wrapper); |
|
|
|
|
|
popUp.setContentView(popUpContent); |
|
|
|
|
|
popUp.setWidth(LinearLayout.LayoutParams.WRAP_CONTENT); |
|
|
|
|
|
popUp.setHeight(LinearLayout.LayoutParams.WRAP_CONTENT); |
|
|
|
|
|
popUp.setFocusable(true); |
|
|
|
|
|
|
|
|
|
|
|
((TextView) popUpContent.findViewById(R.id.upload_filename_info_text)). |
|
|
|
|
|
setMovementMethod(LinkMovementMethod.getInstance()); |
|
|
|
|
|
//Displays the popup
|
|
|
|
|
|
popUp.showAsDropDown(view); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
uploadFilename = findViewById(R.id.upload_filename); |
|
|
|
|
|
textWatcher = new CustomTextWatcher(); |
|
|
|
|
|
uploadFilename.addTextChangedListener(textWatcher); |
|
|
|
|
|
|
|
|
|
|
|
filesListView = findViewById(R.id.upload_files_list); |
|
|
|
|
|
|
|
|
AppCompatButton selectFileButton = findViewById(R.id.upload_select_file_button); |
|
|
AppCompatButton selectFileButton = findViewById(R.id.upload_select_file_button); |
|
|
Drawable selectStartDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_insert_drive_file_white_24dp); |
|
|
Drawable selectStartDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_insert_drive_file_white_24dp); |
|
|
@ -212,7 +267,8 @@ public class UploadActivity extends BaseActivity { |
|
|
Intent intent = new Intent(Intent.ACTION_GET_CONTENT) |
|
|
Intent intent = new Intent(Intent.ACTION_GET_CONTENT) |
|
|
//.setType("*/*")
|
|
|
//.setType("*/*")
|
|
|
.setType("image/jpeg") |
|
|
.setType("image/jpeg") |
|
|
.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes); |
|
|
.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes) |
|
|
|
|
|
.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); |
|
|
|
|
|
|
|
|
startActivityForResult(intent, AFR_REQUEST_CODE_CHOOSE_FILE); |
|
|
startActivityForResult(intent, AFR_REQUEST_CODE_CHOOSE_FILE); |
|
|
}); |
|
|
}); |
|
|
@ -221,118 +277,153 @@ public class UploadActivity extends BaseActivity { |
|
|
Drawable takePhotoDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_photo_camera_white_24dp); |
|
|
Drawable takePhotoDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_photo_camera_white_24dp); |
|
|
takePhotoButton.setCompoundDrawablesRelativeWithIntrinsicBounds(takePhotoDrawable, null, null, null); |
|
|
takePhotoButton.setCompoundDrawablesRelativeWithIntrinsicBounds(takePhotoDrawable, null, null, null); |
|
|
takePhotoButton.setOnClickListener(v -> { |
|
|
takePhotoButton.setOnClickListener(v -> { |
|
|
Intent takePhotoIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); |
|
|
if (checkPerms()) |
|
|
takePhotoIntent.putExtra("return-data", true); |
|
|
takePhoto(); |
|
|
takePhotoIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(UploadsHelper.getCacheFile(this))); |
|
|
else |
|
|
|
|
|
requestPerms(UPLOAD_REQUEST_CODE); |
|
|
Intent targetedIntent = new Intent(takePhotoIntent); |
|
|
|
|
|
List<ResolveInfo> resInfo = this.getPackageManager().queryIntentActivities(takePhotoIntent, 0); |
|
|
|
|
|
for (ResolveInfo resolveInfo : resInfo) { |
|
|
|
|
|
String packageName = resolveInfo.activityInfo.packageName; |
|
|
|
|
|
targetedIntent.setPackage(packageName); |
|
|
|
|
|
} |
|
|
|
|
|
startActivityForResult(takePhotoIntent, AFR_REQUEST_CODE_CAMERA); |
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
FloatingActionButton uploadFAB = findViewById(R.id.upload_fab); |
|
|
FloatingActionButton uploadFAB = findViewById(R.id.upload_fab); |
|
|
|
|
|
uploadFAB.setTag(true); |
|
|
uploadFAB.setOnClickListener(view -> { |
|
|
uploadFAB.setOnClickListener(view -> { |
|
|
|
|
|
//Attempts upload
|
|
|
progressBar.setVisibility(View.VISIBLE); |
|
|
progressBar.setVisibility(View.VISIBLE); |
|
|
|
|
|
|
|
|
String uploadTitleText = uploadTitle.getText().toString(); |
|
|
String uploadTitleText = uploadTitle.getText().toString(); |
|
|
String uploadDescriptionText = uploadDescription.getText().toString(); |
|
|
String editTextFilename = uploadFilename.getText().toString(); |
|
|
|
|
|
final String[] uploadDescriptionText = {uploadDescription.getText().toString()}; |
|
|
|
|
|
|
|
|
|
|
|
//Checks if all required fields are filled
|
|
|
|
|
|
{ |
|
|
|
|
|
boolean shouldReturn = false; |
|
|
if (uploadTitleText.equals("")) { |
|
|
if (uploadTitleText.equals("")) { |
|
|
uploadTitle.setError("Required"); |
|
|
uploadTitle.setError("Required"); |
|
|
|
|
|
shouldReturn = true; |
|
|
} |
|
|
} |
|
|
if (fileUri == null) { |
|
|
if (filesList.isEmpty()) { |
|
|
Toast.makeText(view.getContext(), "Please choose a file to upload or take a photo", Toast.LENGTH_LONG).show(); |
|
|
Toast.makeText(view.getContext(), "Please choose a file to upload or take a photo", Toast.LENGTH_LONG).show(); |
|
|
|
|
|
shouldReturn = true; |
|
|
} |
|
|
} |
|
|
if (categorySelected.equals("-1")) { |
|
|
if (categorySelected.equals("-1")) { |
|
|
Toast.makeText(view.getContext(), "Please choose category first", Toast.LENGTH_SHORT).show(); |
|
|
Toast.makeText(view.getContext(), "Please choose category first", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
shouldReturn = true; |
|
|
|
|
|
} |
|
|
|
|
|
if (!filesList.isEmpty()) { |
|
|
|
|
|
long totalFilesSize = 0; |
|
|
|
|
|
for (UploadFile file : filesList) { |
|
|
|
|
|
totalFilesSize += FileUtils.sizeFromUri(this, file.getFileUri()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (categorySelected.equals("-1") || uploadTitleText.equals("") || fileUri == null) { |
|
|
if (totalFilesSize > MAX_FILE_SIZE_SUPPORTED) { |
|
|
|
|
|
Toast.makeText(view.getContext(), "Your files are too powerful for thmmy. Reduce size or split!", Toast.LENGTH_LONG).show(); |
|
|
|
|
|
shouldReturn = true; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (!editTextFilename.matches("(.+\\.)+.+") || |
|
|
|
|
|
!FileUtils.getFilenameWithoutExtension(editTextFilename). |
|
|
|
|
|
matches("[0-9a-zA-Zα-ωΑ-Ω~!@#$%^&()_+=\\-`\\[\\]{};',.]+")) { |
|
|
|
|
|
uploadFilename.setError("Invalid filename"); |
|
|
|
|
|
shouldReturn = true; |
|
|
|
|
|
} |
|
|
|
|
|
if (shouldReturn) { |
|
|
progressBar.setVisibility(View.GONE); |
|
|
progressBar.setVisibility(View.GONE); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
AlertDialog.Builder builder = new AlertDialog.Builder(this); |
|
|
|
|
|
builder.setTitle("Upload to thmmy"); |
|
|
|
|
|
builder.setMessage("Are you sure?"); |
|
|
|
|
|
builder.setPositiveButton("YES, FIRE AWAY", (dialog, which) -> { |
|
|
|
|
|
//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[0] += uploadedFromThmmyPromptHtml; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for (UploadFile file : filesList) { |
|
|
|
|
|
if (file.isCameraPhoto()) { |
|
|
|
|
|
TakePhoto.galleryAddPic(this, file.getPhotoFile()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
String tempFilePath = null; |
|
|
Uri tempFileUri = null; |
|
|
if (uploadFilename != null) { |
|
|
if (filesList.size() == 1) { |
|
|
//File should be uploaded with a certain name. Temporarily copies the file and renames it
|
|
|
//Checks if the file needs renaming
|
|
|
tempFilePath = UploadsHelper.createTempFile(this, fileUri, uploadFilename); |
|
|
UploadFile uploadFile = filesList.get(0); |
|
|
if (tempFilePath == null) { |
|
|
String selectedFileFilename = FileUtils.filenameFromUri(this, uploadFile.getFileUri()); |
|
|
|
|
|
|
|
|
|
|
|
if (!editTextFilename.equals(selectedFileFilename)) { |
|
|
|
|
|
//File should be uploaded with a different name
|
|
|
|
|
|
if (!uploadFile.isCameraPhoto()) { |
|
|
|
|
|
//Temporarily copies the file to a another location and renames it
|
|
|
|
|
|
tempFileUri = UploadsHelper.createTempFile(this, storage, |
|
|
|
|
|
uploadFile.getFileUri(), |
|
|
|
|
|
FileUtils.getFilenameWithoutExtension(editTextFilename)); |
|
|
|
|
|
} else { |
|
|
|
|
|
//Renames the photo taken
|
|
|
|
|
|
String photoPath = uploadFile.getPhotoFile().getPath(); |
|
|
|
|
|
photoPath = photoPath.substring(0, photoPath.lastIndexOf(File.separator)); |
|
|
|
|
|
String destinationFilename = photoPath + File.separator + |
|
|
|
|
|
FileUtils.getFilenameWithoutExtension(editTextFilename) + ".jpg"; |
|
|
|
|
|
|
|
|
|
|
|
if (!storage.rename(uploadFile.getPhotoFile().getAbsolutePath(), destinationFilename)) { |
|
|
//Something went wrong, abort
|
|
|
//Something went wrong, abort
|
|
|
Toast.makeText(this, "Could not create temporary file for renaming", Toast.LENGTH_SHORT).show(); |
|
|
Toast.makeText(this, "Could not create temporary file for renaming", Toast.LENGTH_SHORT).show(); |
|
|
progressBar.setVisibility(View.GONE); |
|
|
progressBar.setVisibility(View.GONE); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
//Points photoFile and fileUri to the new copied and renamed file
|
|
|
new MultipartUploadRequest(view.getContext(), uploadIndexUrl) |
|
|
uploadFile.setPhotoFile(storage.getFile(destinationFilename)); |
|
|
.setUtf8Charset() |
|
|
uploadFile.setFileUri(FileProvider.getUriForFile(this, getPackageName() + |
|
|
.addParameter("tp-dluploadtitle", uploadTitleText) |
|
|
".provider", uploadFile.getPhotoFile())); |
|
|
.addParameter("tp-dluploadcat", categorySelected) |
|
|
|
|
|
.addParameter("tp-dluploadtext", uploadDescriptionText) |
|
|
|
|
|
.addFileToUpload(tempFilePath == null |
|
|
|
|
|
? fileUri.toString() |
|
|
|
|
|
: tempFilePath |
|
|
|
|
|
, "tp-dluploadfile") |
|
|
|
|
|
.addParameter("tp_dluploadicon", fileIcon) |
|
|
|
|
|
.addParameter("tp-uploaduser", uploaderProfileIndex) |
|
|
|
|
|
.setNotificationConfig(new UploadNotificationConfig()) |
|
|
|
|
|
.setMaxRetries(2) |
|
|
|
|
|
.setDelegate(new UploadStatusDelegate() { |
|
|
|
|
|
@Override |
|
|
|
|
|
public void onProgress(Context context, UploadInfo uploadInfo) { |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
@Override |
|
|
} else { |
|
|
public void onError(Context context, UploadInfo uploadInfo, ServerResponse serverResponse, |
|
|
Uri[] filesListArray = new Uri[filesList.size()]; |
|
|
Exception exception) { |
|
|
for (int i = 0; i < filesList.size(); ++i) { |
|
|
Toast.makeText(context, "Upload failed", Toast.LENGTH_SHORT).show(); |
|
|
filesListArray[i] = filesList.get(i).getFileUri(); |
|
|
UploadsHelper.deleteTempFiles(); |
|
|
|
|
|
progressBar.setVisibility(View.GONE); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
new ZipTask(this, editTextFilename, categorySelected, |
|
|
public void onCompleted(Context context, UploadInfo uploadInfo, ServerResponse serverResponse) { |
|
|
uploadTitleText, uploadDescriptionText[0], fileIcon, |
|
|
Toast.makeText(context, "Upload completed successfully", Toast.LENGTH_SHORT).show(); |
|
|
uploaderProfileIndex).execute(filesListArray); |
|
|
UploadsHelper.deleteTempFiles(); |
|
|
finish(); |
|
|
BaseApplication.getInstance().logFirebaseAnalyticsEvent("file_upload", null); |
|
|
return; |
|
|
|
|
|
|
|
|
uploadTitle.setText(null); |
|
|
|
|
|
uploadDescription.setText(null); |
|
|
|
|
|
fileUri = null; |
|
|
|
|
|
filenameHolder.setText(null); |
|
|
|
|
|
filenameHolder.setVisibility(View.GONE); |
|
|
|
|
|
progressBar.setVisibility(View.GONE); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
String uploadID = UUID.randomUUID().toString(); |
|
|
public void onCancelled(Context context, UploadInfo uploadInfo) { |
|
|
if (uploadFile(this, uploadID, getConfigForUpload(this, uploadID, |
|
|
Toast.makeText(context, "Upload canceled", Toast.LENGTH_SHORT).show(); |
|
|
editTextFilename), |
|
|
|
|
|
categorySelected, uploadTitleText, |
|
|
|
|
|
uploadDescriptionText[0], fileIcon, uploaderProfileIndex, |
|
|
|
|
|
tempFileUri == null |
|
|
|
|
|
? filesList.get(0).getFileUri() |
|
|
|
|
|
: tempFileUri)) { |
|
|
|
|
|
finish(); |
|
|
|
|
|
} else { |
|
|
|
|
|
Toast.makeText(this, "Couldn't initiate upload.", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
UploadsHelper.deleteTempFiles(); |
|
|
builder.setNegativeButton("NOPE", (dialog, which) -> { |
|
|
progressBar.setVisibility(View.GONE); |
|
|
progressBar.setVisibility(View.GONE); |
|
|
} |
|
|
dialog.dismiss(); |
|
|
}) |
|
|
}); |
|
|
.startUpload(); |
|
|
|
|
|
} catch (Exception exception) { |
|
|
AlertDialog alert = builder.create(); |
|
|
Timber.e(exception, "AndroidUploadService: %s", exception.getMessage()); |
|
|
alert.setOnCancelListener(dialog -> { |
|
|
progressBar.setVisibility(View.GONE); |
|
|
progressBar.setVisibility(View.GONE); |
|
|
} |
|
|
dialog.dismiss(); |
|
|
|
|
|
}); |
|
|
|
|
|
alert.show(); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
if (uploadRootCategories.isEmpty()) { |
|
|
if (uploadRootCategories.isEmpty()) { |
|
|
//Parses the uploads page
|
|
|
//Parses the uploads page
|
|
|
parseUploadPageTask = new ParseUploadPageTask(); |
|
|
parseUploadPageTask = new ParseUploadPageTask(); |
|
|
parseUploadPageTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, uploadIndexUrl); |
|
|
parseUploadPageTask.execute(uploadIndexUrl); |
|
|
} else { |
|
|
} else { |
|
|
//Renders the already parsed data
|
|
|
//Renders the already parsed data
|
|
|
updateUIElements(); |
|
|
updateUIElements(); |
|
|
@ -355,12 +446,18 @@ public class UploadActivity extends BaseActivity { |
|
|
super.onResume(); |
|
|
super.onResume(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
protected void onPause() { |
|
|
|
|
|
super.onPause(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
protected void onDestroy() { |
|
|
protected void onDestroy() { |
|
|
super.onDestroy(); |
|
|
super.onDestroy(); |
|
|
if (parseUploadPageTask != null && parseUploadPageTask.getStatus() != AsyncTask.Status.RUNNING) |
|
|
if (parseUploadPageTask != null && parseUploadPageTask.getStatus() != AsyncTask.Status.RUNNING) { |
|
|
parseUploadPageTask.cancel(true); |
|
|
parseUploadPageTask.cancel(true); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) { |
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) { |
|
|
@ -369,11 +466,35 @@ public class UploadActivity extends BaseActivity { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
fileUri = data.getData(); |
|
|
if (data.getClipData() != null) { |
|
|
if (fileUri != null) { |
|
|
fileIcon = "archive.gif"; |
|
|
String filename = UploadsHelper.filenameFromUri(this, fileUri); |
|
|
textWatcher.setFileExtension(".zip"); |
|
|
filenameHolder.setText(filename); |
|
|
|
|
|
filenameHolder.setVisibility(View.VISIBLE); |
|
|
if (!hasModifiedFilename) { |
|
|
|
|
|
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.FRANCE).format(new Date()); |
|
|
|
|
|
String zipFilename = "mThmmy_" + timeStamp + ".zip"; |
|
|
|
|
|
uploadFilename.setText(zipFilename); |
|
|
|
|
|
hasModifiedFilename = false; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for (int fileIndex = 0; fileIndex < data.getClipData().getItemCount(); ++fileIndex) { |
|
|
|
|
|
Uri newFileUri = data.getClipData().getItemAt(fileIndex).getUri(); |
|
|
|
|
|
String filename = FileUtils.filenameFromUri(this, newFileUri); |
|
|
|
|
|
addFileViewToList(filename); |
|
|
|
|
|
filesList.add(new UploadFile(false, newFileUri, null)); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
Uri newFileUri = data.getData(); |
|
|
|
|
|
if (newFileUri != null) { |
|
|
|
|
|
String filename = FileUtils.filenameFromUri(this, newFileUri); |
|
|
|
|
|
|
|
|
|
|
|
if (filesList.isEmpty()) { |
|
|
|
|
|
textWatcher.setFileExtension(FileUtils.getFileExtension(filename)); |
|
|
|
|
|
|
|
|
|
|
|
if (!hasModifiedFilename) { |
|
|
|
|
|
uploadFilename.setText(filename); |
|
|
|
|
|
hasModifiedFilename = false; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
filename = filename.toLowerCase(); |
|
|
filename = filename.toLowerCase(); |
|
|
if (filename.endsWith(".jpg")) { |
|
|
if (filename.endsWith(".jpg")) { |
|
|
@ -394,46 +515,70 @@ public class UploadActivity extends BaseActivity { |
|
|
} else { |
|
|
} else { |
|
|
fileIcon = "blank.gif"; |
|
|
fileIcon = "blank.gif"; |
|
|
} |
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
fileIcon = "archive.gif"; |
|
|
|
|
|
textWatcher.setFileExtension(".zip"); |
|
|
|
|
|
|
|
|
|
|
|
if (!hasModifiedFilename) { |
|
|
|
|
|
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.FRANCE).format(new Date()); |
|
|
|
|
|
String zipFilename = "mThmmy_" + timeStamp + ".zip"; |
|
|
|
|
|
uploadFilename.setText(zipFilename); |
|
|
|
|
|
hasModifiedFilename = false; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
addFileViewToList(filename); |
|
|
|
|
|
filesList.add(new UploadFile(false, newFileUri, null)); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} else if (requestCode == AFR_REQUEST_CODE_CAMERA) { |
|
|
} else if (requestCode == AFR_REQUEST_CODE_CAMERA) { |
|
|
if (resultCode == Activity.RESULT_CANCELED) { |
|
|
if (resultCode == Activity.RESULT_CANCELED) { |
|
|
|
|
|
//Deletes image file
|
|
|
|
|
|
storage.deleteFile(photoFileCreated.getAbsolutePath()); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Bitmap bitmap; |
|
|
if (filesList.isEmpty()) { |
|
|
File cacheImageFile = UploadsHelper.getCacheFile(this); |
|
|
textWatcher.setFileExtension(FileUtils.getFileExtension(photoFileCreated.getName())); |
|
|
|
|
|
|
|
|
Uri cacheFileUri = Uri.fromFile(cacheImageFile); |
|
|
|
|
|
fileIcon = "jpg_image.gif"; |
|
|
|
|
|
|
|
|
|
|
|
bitmap = UploadsHelper.getImageResized(this, cacheFileUri); |
|
|
if (!hasModifiedFilename) { |
|
|
int rotation = UploadsHelper.getRotation(this, cacheFileUri); |
|
|
uploadFilename.setText(photoFileCreated.getName()); |
|
|
bitmap = UploadsHelper.rotate(bitmap, rotation); |
|
|
hasModifiedFilename = false; |
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
FileOutputStream out = new FileOutputStream(cacheImageFile); |
|
|
|
|
|
bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out); |
|
|
|
|
|
out.flush(); |
|
|
|
|
|
out.close(); |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
e.printStackTrace(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
String newFilename = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.FRANCE). |
|
|
fileIcon = "jpg_image.gif"; |
|
|
format(new Date()); |
|
|
} else { |
|
|
fileUri = Uri.parse(UploadsHelper.createTempFile(this, cacheFileUri, newFilename)); |
|
|
fileIcon = "archive.gif"; |
|
|
|
|
|
textWatcher.setFileExtension(".zip"); |
|
|
|
|
|
|
|
|
newFilename += ".jpg"; |
|
|
if (!hasModifiedFilename) { |
|
|
filenameHolder.setText(newFilename); |
|
|
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.FRANCE).format(new Date()); |
|
|
filenameHolder.setVisibility(View.VISIBLE); |
|
|
String zipFilename = "mThmmy_" + timeStamp + ".zip"; |
|
|
|
|
|
uploadFilename.setText(zipFilename); |
|
|
|
|
|
hasModifiedFilename = false; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
UploadsHelper.deleteCacheFiles(this); |
|
|
UploadFile newFile = new UploadFile(true, TakePhoto.processResult(this, |
|
|
|
|
|
photoFileCreated), photoFileCreated); |
|
|
|
|
|
addFileViewToList(FileUtils.getFilenameWithoutExtension(FileUtils. |
|
|
|
|
|
filenameFromUri(this, newFile.getFileUri()))); |
|
|
|
|
|
filesList.add(newFile); |
|
|
} else if (requestCode == AFR_REQUEST_CODE_FIELDS_BUILDER) { |
|
|
} else if (requestCode == AFR_REQUEST_CODE_FIELDS_BUILDER) { |
|
|
if (resultCode == Activity.RESULT_CANCELED) { |
|
|
if (resultCode == Activity.RESULT_CANCELED) { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
uploadFilename = data.getStringExtra(RESULT_FILENAME); |
|
|
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); |
|
|
|
|
|
} |
|
|
|
|
|
hasModifiedFilename = true; |
|
|
|
|
|
|
|
|
uploadTitle.setText(data.getStringExtra(RESULT_TITLE)); |
|
|
uploadTitle.setText(data.getStringExtra(RESULT_TITLE)); |
|
|
uploadDescription.setText(data.getStringExtra(RESULT_DESCRIPTION)); |
|
|
uploadDescription.setText(data.getStringExtra(RESULT_DESCRIPTION)); |
|
|
} else { |
|
|
} else { |
|
|
@ -441,6 +586,243 @@ public class UploadActivity extends BaseActivity { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onRequestPermissionsResult(int permsRequestCode, @NonNull String[] permissions |
|
|
|
|
|
, @NonNull int[] grantResults) { |
|
|
|
|
|
switch (permsRequestCode) { |
|
|
|
|
|
case UPLOAD_REQUEST_CODE: |
|
|
|
|
|
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) |
|
|
|
|
|
takePhoto(); |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Should only be called after making sure permissions are granted
|
|
|
|
|
|
private void takePhoto() { |
|
|
|
|
|
// Create the File where the photo should go
|
|
|
|
|
|
photoFileCreated = TakePhoto.createImageFile(this); |
|
|
|
|
|
|
|
|
|
|
|
// Continue only if the File was successfully created
|
|
|
|
|
|
if (photoFileCreated != null) { |
|
|
|
|
|
startActivityForResult(TakePhoto.getIntent(this, photoFileCreated), |
|
|
|
|
|
AFR_REQUEST_CODE_CAMERA); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void updateUIElements() { |
|
|
|
|
|
String[] tmpSpinnerArray = new String[uploadRootCategories.size()]; |
|
|
|
|
|
for (int i = 0; i < uploadRootCategories.size(); ++i) { |
|
|
|
|
|
tmpSpinnerArray[i] = uploadRootCategories.get(i).getCategoryTitle(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<>(BaseApplication.getInstance().getApplicationContext(), |
|
|
|
|
|
R.layout.spinner_item, tmpSpinnerArray); |
|
|
|
|
|
spinnerArrayAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item); |
|
|
|
|
|
rootCategorySpinner.setAdapter(spinnerArrayAdapter); |
|
|
|
|
|
|
|
|
|
|
|
//Sets bundle selection
|
|
|
|
|
|
if (bundleCategory != null) { |
|
|
|
|
|
int bundleSelectionIndex = -1, currentIndex = 0; |
|
|
|
|
|
|
|
|
|
|
|
for (UploadCategory category : uploadRootCategories) { |
|
|
|
|
|
if (bundleCategory.get(0).contains(category.getCategoryTitle())) { |
|
|
|
|
|
bundleSelectionIndex = currentIndex; |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
++currentIndex; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (bundleSelectionIndex != -1) { |
|
|
|
|
|
rootCategorySpinner.setSelection(bundleSelectionIndex, true); |
|
|
|
|
|
bundleCategory.remove(0); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void addFileViewToList(String filename) { |
|
|
|
|
|
LayoutInflater layoutInflater = getLayoutInflater(); |
|
|
|
|
|
LinearLayout newFileRow = (LinearLayout) layoutInflater. |
|
|
|
|
|
inflate(R.layout.activity_upload_file_list_row, null); |
|
|
|
|
|
|
|
|
|
|
|
TextView itemText = newFileRow.findViewById(R.id.upload_file_item_text); |
|
|
|
|
|
itemText.setTypeface(Typeface.createFromAsset(this.getAssets() |
|
|
|
|
|
, "fonts/fontawesome-webfont.ttf")); |
|
|
|
|
|
String filenameWithIcon = faIconFromFilename(this, filename) + " " + filename; |
|
|
|
|
|
itemText.setText(filenameWithIcon); |
|
|
|
|
|
|
|
|
|
|
|
newFileRow.findViewById(R.id.upload_file_item_remove).setOnClickListener(view -> { |
|
|
|
|
|
int fileIndex = filesListView.indexOfChild(newFileRow); |
|
|
|
|
|
filesListView.removeViewAt(fileIndex); |
|
|
|
|
|
|
|
|
|
|
|
if (filesList.get(fileIndex).isCameraPhoto()) { |
|
|
|
|
|
storage.deleteFile(filesList.get(fileIndex).getPhotoFile().getAbsolutePath()); |
|
|
|
|
|
} |
|
|
|
|
|
filesList.remove(fileIndex); |
|
|
|
|
|
if (filesList.isEmpty()) { |
|
|
|
|
|
filesListView.setVisibility(View.GONE); |
|
|
|
|
|
} else if (filesList.size() == 1) { |
|
|
|
|
|
textWatcher.setFileExtension(FileUtils.getFileExtension(FileUtils. |
|
|
|
|
|
filenameFromUri(this, filesList.get(0).getFileUri()))); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
filesListView.addView(newFileRow); |
|
|
|
|
|
filesListView.setVisibility(View.VISIBLE); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static UploadNotificationConfig getConfigForUpload(Context context, String uploadID, |
|
|
|
|
|
String filename) { |
|
|
|
|
|
UploadNotificationConfig uploadNotificationConfig = new UploadNotificationConfig(); |
|
|
|
|
|
uploadNotificationConfig.setIconForAllStatuses(android.R.drawable.stat_sys_upload); |
|
|
|
|
|
uploadNotificationConfig.setTitleForAllStatuses("Uploading " + filename); |
|
|
|
|
|
|
|
|
|
|
|
uploadNotificationConfig.getProgress().iconResourceID = android.R.drawable.stat_sys_upload; |
|
|
|
|
|
uploadNotificationConfig.getCompleted().iconResourceID = android.R.drawable.stat_sys_upload_done; |
|
|
|
|
|
uploadNotificationConfig.getError().iconResourceID = android.R.drawable.stat_sys_upload_done; |
|
|
|
|
|
uploadNotificationConfig.getError().iconColorResourceID = R.color.error_red; |
|
|
|
|
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { |
|
|
|
|
|
uploadNotificationConfig.getError().message = "Error during upload. Click for options"; |
|
|
|
|
|
} |
|
|
|
|
|
uploadNotificationConfig.getCancelled().iconColorResourceID = android.R.drawable.stat_sys_upload_done; |
|
|
|
|
|
uploadNotificationConfig.getCancelled().autoClear = true; |
|
|
|
|
|
|
|
|
|
|
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { |
|
|
|
|
|
Intent combinedActionsIntent = new Intent(UploadsReceiver.ACTION_COMBINED_UPLOAD); |
|
|
|
|
|
combinedActionsIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_ID_KEY, uploadID); |
|
|
|
|
|
|
|
|
|
|
|
/*combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_FILENAME, filename); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_CATEGORY, retryCategory); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_TITLE, retryTitleText); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_DESCRIPTION, retryDescription); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_ICON, retryIcon); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_UPLOADER, retryUploaderProfile); |
|
|
|
|
|
combinedActionsIntent.putExtra(UploadsReceiver.UPLOAD_RETRY_FILE_URI, retryFileUri);*/ |
|
|
|
|
|
|
|
|
|
|
|
uploadNotificationConfig.setClickIntentForAllStatuses(PendingIntent.getBroadcast(context, |
|
|
|
|
|
1, combinedActionsIntent, PendingIntent.FLAG_UPDATE_CURRENT)); |
|
|
|
|
|
} |
|
|
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { |
|
|
|
|
|
Intent retryIntent = new Intent(context, UploadsReceiver.class); |
|
|
|
|
|
retryIntent.setAction(UploadsReceiver.ACTION_RETRY_UPLOAD); |
|
|
|
|
|
retryIntent.putExtra(UploadsReceiver.UPLOAD_ID_KEY, uploadID); |
|
|
|
|
|
|
|
|
|
|
|
Intent cancelIntent = new Intent(context, UploadsReceiver.class); |
|
|
|
|
|
cancelIntent.setAction(UploadsReceiver.ACTION_CANCEL_UPLOAD); |
|
|
|
|
|
cancelIntent.putExtra(UploadsReceiver.UPLOAD_ID_KEY, uploadID); |
|
|
|
|
|
|
|
|
|
|
|
uploadNotificationConfig.getProgress().actions.add(new UploadNotificationAction( |
|
|
|
|
|
R.drawable.ic_cancel_accent_24dp, |
|
|
|
|
|
context.getString(R.string.upload_notification_cancel), |
|
|
|
|
|
PendingIntent.getBroadcast(context, 0, cancelIntent, |
|
|
|
|
|
PendingIntent.FLAG_UPDATE_CURRENT) |
|
|
|
|
|
)); |
|
|
|
|
|
uploadNotificationConfig.getError().actions.add(new UploadNotificationAction( |
|
|
|
|
|
R.drawable.ic_notification, |
|
|
|
|
|
context.getString(R.string.upload_notification_retry), |
|
|
|
|
|
PendingIntent.getBroadcast(context, 0, retryIntent, |
|
|
|
|
|
PendingIntent.FLAG_UPDATE_CURRENT) |
|
|
|
|
|
)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return uploadNotificationConfig; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static boolean uploadFile(Context context, String uploadID, |
|
|
|
|
|
UploadNotificationConfig uploadNotificationConfig, |
|
|
|
|
|
String categorySelected, String uploadTitleText, |
|
|
|
|
|
String uploadDescriptionText, String fileIcon, |
|
|
|
|
|
String uploaderProfileIndex, Uri fileUri) { |
|
|
|
|
|
try { |
|
|
|
|
|
new MultipartUploadRequest(context, uploadID, uploadIndexUrl) |
|
|
|
|
|
.setUtf8Charset() |
|
|
|
|
|
.setNotificationConfig(uploadNotificationConfig) |
|
|
|
|
|
.addParameter("tp-dluploadtitle", uploadTitleText) |
|
|
|
|
|
.addParameter("tp-dluploadcat", categorySelected) |
|
|
|
|
|
.addParameter("tp-dluploadtext", uploadDescriptionText) |
|
|
|
|
|
.addFileToUpload(fileUri.toString() |
|
|
|
|
|
, "tp-dluploadfile") |
|
|
|
|
|
.addParameter("tp_dluploadicon", fileIcon) |
|
|
|
|
|
.addParameter("tp-uploaduser", uploaderProfileIndex) |
|
|
|
|
|
.setNotificationConfig(uploadNotificationConfig) |
|
|
|
|
|
.setMaxRetries(2) |
|
|
|
|
|
.startUpload(); |
|
|
|
|
|
|
|
|
|
|
|
Toast.makeText(context, "Uploading files in the background.", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
return true; |
|
|
|
|
|
} catch (Exception exception) { |
|
|
|
|
|
Timber.e(exception, "AndroidUploadService: %s", exception.getMessage()); |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private class CustomTextWatcher implements TextWatcher { |
|
|
|
|
|
String oldFilename, fileExtension; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void beforeTextChanged(CharSequence s, int start, int count, int after) { |
|
|
|
|
|
//Saves an instance of the filename before changing
|
|
|
|
|
|
oldFilename = s.toString(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onTextChanged(CharSequence s, int start, int before, int count) { |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void afterTextChanged(Editable s) { |
|
|
|
|
|
//Warns user for bad filenames
|
|
|
|
|
|
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); |
|
|
|
|
|
} else { |
|
|
|
|
|
uploadFilenameInfo.setImageResource(R.drawable.ic_info_outline_white_24dp); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (fileExtension == null) { |
|
|
|
|
|
hasModifiedFilename = !s.toString().isEmpty(); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!s.toString().endsWith(fileExtension)) { |
|
|
|
|
|
//User tried to alter the extension
|
|
|
|
|
|
//Prevents the change
|
|
|
|
|
|
uploadFilename.setText(oldFilename); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//User has modified the filename
|
|
|
|
|
|
hasModifiedFilename = true; |
|
|
|
|
|
if (s.toString().isEmpty() || (filesList.size() == 1 && s.toString().equals(FileUtils. |
|
|
|
|
|
filenameFromUri(getApplicationContext(), filesList.get(0).getFileUri())))) { |
|
|
|
|
|
//After modification the filename falls back to the original
|
|
|
|
|
|
hasModifiedFilename = false; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//Adds the grey colored span to the extension
|
|
|
|
|
|
s.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.secondary_text)), |
|
|
|
|
|
s.length() - fileExtension.length(), s.length(), |
|
|
|
|
|
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void setFileExtension(String extension) { |
|
|
|
|
|
boolean oldHasModifiedFilename = hasModifiedFilename; |
|
|
|
|
|
oldFilename = uploadFilename.getText().toString(); |
|
|
|
|
|
fileExtension = extension; |
|
|
|
|
|
String newFilename; |
|
|
|
|
|
|
|
|
|
|
|
if (!oldFilename.isEmpty()) { |
|
|
|
|
|
newFilename = FileUtils.getFilenameWithoutExtension(oldFilename) + extension; |
|
|
|
|
|
} else { |
|
|
|
|
|
newFilename = extension; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
uploadFilename.setText(newFilename); |
|
|
|
|
|
hasModifiedFilename = oldHasModifiedFilename; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private class CustomOnItemSelectedListener implements AdapterView.OnItemSelectedListener { |
|
|
private class CustomOnItemSelectedListener implements AdapterView.OnItemSelectedListener { |
|
|
private ArrayList<UploadCategory> parentCategories, childCategories; |
|
|
private ArrayList<UploadCategory> parentCategories, childCategories; |
|
|
|
|
|
|
|
|
@ -574,32 +956,79 @@ public class UploadActivity extends BaseActivity { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void updateUIElements() { |
|
|
public static class ZipTask extends AsyncTask<Uri, Void, Boolean> { |
|
|
String[] tmpSpinnerArray = new String[uploadRootCategories.size()]; |
|
|
// Weak references will still allow the Activity to be garbage-collected
|
|
|
for (int i = 0; i < uploadRootCategories.size(); ++i) { |
|
|
private final WeakReference<Activity> weakActivity; |
|
|
tmpSpinnerArray[i] = uploadRootCategories.get(i).getCategoryTitle(); |
|
|
final String zipFilename, categorySelected, uploadTitleText, uploadDescriptionText, |
|
|
|
|
|
fileIcon, uploaderProfileIndex; |
|
|
|
|
|
Uri zipFileUri; |
|
|
|
|
|
|
|
|
|
|
|
// Suppresses default constructor
|
|
|
|
|
|
@SuppressWarnings("unused") |
|
|
|
|
|
private ZipTask() { |
|
|
|
|
|
weakActivity = null; |
|
|
|
|
|
this.zipFilename = null; |
|
|
|
|
|
this.categorySelected = null; |
|
|
|
|
|
this.uploadTitleText = null; |
|
|
|
|
|
this.uploadDescriptionText = null; |
|
|
|
|
|
this.fileIcon = null; |
|
|
|
|
|
this.uploaderProfileIndex = null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ZipTask(Activity uploadsActivity, @NonNull String zipFilename, |
|
|
|
|
|
@NonNull String categorySelected, @NonNull String uploadTitleText, |
|
|
|
|
|
@NonNull String uploadDescriptionText, @NonNull String fileIcon, |
|
|
|
|
|
@NonNull String uploaderProfileIndex) { |
|
|
|
|
|
weakActivity = new WeakReference<>(uploadsActivity); |
|
|
|
|
|
this.zipFilename = zipFilename; |
|
|
|
|
|
this.categorySelected = categorySelected; |
|
|
|
|
|
this.uploadTitleText = uploadTitleText; |
|
|
|
|
|
this.uploadDescriptionText = uploadDescriptionText; |
|
|
|
|
|
this.fileIcon = fileIcon; |
|
|
|
|
|
this.uploaderProfileIndex = uploaderProfileIndex; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<>(BaseApplication.getInstance().getApplicationContext(), |
|
|
@Override |
|
|
R.layout.spinner_item, tmpSpinnerArray); |
|
|
protected void onPreExecute() { |
|
|
spinnerArrayAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item); |
|
|
assert weakActivity != null; |
|
|
rootCategorySpinner.setAdapter(spinnerArrayAdapter); |
|
|
Toast.makeText(weakActivity.get(), "Zipping files", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//Sets bundle selection
|
|
|
@Override |
|
|
if (bundleCategory != null) { |
|
|
protected Boolean doInBackground(Uri... filesToZip) { |
|
|
int bundleSelectionIndex = -1, currentIndex = 0; |
|
|
if (weakActivity == null || zipFilename == null) { |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
File zipFile = UploadsHelper.createZipFile(zipFilename); |
|
|
|
|
|
|
|
|
for (UploadCategory category : uploadRootCategories) { |
|
|
if (zipFile == null) { |
|
|
if (bundleCategory.get(0).contains(category.getCategoryTitle())) { |
|
|
return false; |
|
|
bundleSelectionIndex = currentIndex; |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
} |
|
|
++currentIndex; |
|
|
zipFileUri = FileProvider.getUriForFile(weakActivity.get(), |
|
|
|
|
|
weakActivity.get().getPackageName() + |
|
|
|
|
|
".provider", zipFile); |
|
|
|
|
|
|
|
|
|
|
|
UploadsHelper.zip(weakActivity.get(), filesToZip, zipFileUri); |
|
|
|
|
|
return true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (bundleSelectionIndex != -1) { |
|
|
@Override |
|
|
rootCategorySpinner.setSelection(bundleSelectionIndex, true); |
|
|
protected void onPostExecute(Boolean result) { |
|
|
bundleCategory.remove(0); |
|
|
if (weakActivity == null) { |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!result) { |
|
|
|
|
|
Toast.makeText(weakActivity.get(), "Couldn't create zip!", Toast.LENGTH_SHORT).show(); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
String uploadID = UUID.randomUUID().toString(); |
|
|
|
|
|
if (!uploadFile(weakActivity.get(), uploadID, |
|
|
|
|
|
getConfigForUpload(weakActivity.get(), uploadID, zipFilename), categorySelected, |
|
|
|
|
|
uploadTitleText, uploadDescriptionText, fileIcon, uploaderProfileIndex, |
|
|
|
|
|
zipFileUri)) { |
|
|
|
|
|
Toast.makeText(weakActivity.get(), "Couldn't initiate upload.", Toast.LENGTH_SHORT).show(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
