|
|
|
|
@ -30,11 +30,6 @@ import android.net.Uri; |
|
|
|
|
import android.os.Build; |
|
|
|
|
import android.os.Bundle; |
|
|
|
|
import android.provider.OpenableColumns; |
|
|
|
|
import android.support.v7.app.AlertDialog; |
|
|
|
|
import android.support.v7.app.AppCompatActivity; |
|
|
|
|
import android.support.v7.widget.GridLayoutManager; |
|
|
|
|
import android.support.v7.widget.RecyclerView; |
|
|
|
|
import android.support.v7.widget.Toolbar; |
|
|
|
|
import android.view.Menu; |
|
|
|
|
import android.view.MenuItem; |
|
|
|
|
import android.view.View; |
|
|
|
|
@ -47,6 +42,11 @@ import android.widget.LinearLayout; |
|
|
|
|
import android.widget.Spinner; |
|
|
|
|
import android.widget.Toast; |
|
|
|
|
|
|
|
|
|
import androidx.appcompat.app.AlertDialog; |
|
|
|
|
import androidx.appcompat.app.AppCompatActivity; |
|
|
|
|
import androidx.recyclerview.widget.GridLayoutManager; |
|
|
|
|
import androidx.recyclerview.widget.RecyclerView; |
|
|
|
|
|
|
|
|
|
import java.io.ByteArrayOutputStream; |
|
|
|
|
import java.io.File; |
|
|
|
|
import java.io.FileOutputStream; |
|
|
|
|
@ -93,9 +93,6 @@ public class UploadActivity extends AppCompatActivity { |
|
|
|
|
setContentView(R.layout.upload); |
|
|
|
|
uploadInProgress = false; |
|
|
|
|
|
|
|
|
|
Toolbar toolbar = (Toolbar) findViewById(R.id.upload_toolbar); |
|
|
|
|
setSupportActionBar(toolbar); |
|
|
|
|
|
|
|
|
|
setTitle(R.string.upload_pict); |
|
|
|
|
hideImage(); |
|
|
|
|
|
|
|
|
|
@ -595,37 +592,36 @@ public class UploadActivity extends AppCompatActivity { |
|
|
|
|
//ask for image file
|
|
|
|
|
Intent requestFileIntent = new Intent(Intent.ACTION_PICK); |
|
|
|
|
requestFileIntent.setType("image/*"); |
|
|
|
|
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) |
|
|
|
|
requestFileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE,true); |
|
|
|
|
requestFileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE,true); |
|
|
|
|
startActivityForResult(requestFileIntent, 0); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void onActivityResult(int requestCode, int resultCode,Intent returnIntent) { |
|
|
|
|
if(resultCode == RESULT_OK){ |
|
|
|
|
super.onActivityResult(requestCode, resultCode, returnIntent); |
|
|
|
|
if (resultCode == RESULT_OK) { |
|
|
|
|
//retrieve uri from the request image activity and prepare
|
|
|
|
|
ClipData clip = null; |
|
|
|
|
boolean hasAddUri = false; |
|
|
|
|
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) |
|
|
|
|
clip = returnIntent.getClipData(); |
|
|
|
|
clip = returnIntent.getClipData(); |
|
|
|
|
LinearLayout infosLayout = (LinearLayout) findViewById(R.id.info_layout); |
|
|
|
|
FrameLayout dataLayout = (FrameLayout) findViewById(R.id.data_layout); |
|
|
|
|
if(clip == null) { |
|
|
|
|
if (clip == null) { |
|
|
|
|
Uri imageUri = returnIntent.getData(); |
|
|
|
|
if(imageUri == null) |
|
|
|
|
if (imageUri == null) |
|
|
|
|
return; |
|
|
|
|
uris.add(imageUri); |
|
|
|
|
hasAddUri = true; |
|
|
|
|
updateSpanCount(); |
|
|
|
|
adapter.addUri(this,imageUri); |
|
|
|
|
adapter.addUri(this, imageUri); |
|
|
|
|
|
|
|
|
|
infosLayout.setVisibility(View.GONE); |
|
|
|
|
dataLayout.setVisibility(View.VISIBLE); |
|
|
|
|
} else { |
|
|
|
|
for(int i = 0; i < clip.getItemCount(); i++) { |
|
|
|
|
for (int i = 0; i < clip.getItemCount(); i++) { |
|
|
|
|
Uri imageUri = clip.getItemAt(i).getUri(); |
|
|
|
|
if(imageUri == null) |
|
|
|
|
if (imageUri == null) |
|
|
|
|
continue; |
|
|
|
|
uris.add(imageUri); |
|
|
|
|
hasAddUri = true; |
|
|
|
|
@ -638,7 +634,7 @@ public class UploadActivity extends AppCompatActivity { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(hasAddUri) { |
|
|
|
|
if (hasAddUri) { |
|
|
|
|
Button uploadBt = (Button) findViewById(R.id.upload_button); |
|
|
|
|
uploadBt.setEnabled(false); |
|
|
|
|
} |
|
|
|
|
|
Schoumi
5 months ago