(imageView);
- mContext = context;
- this.rotate = rotate;
- }
-
- /**
- * Actual download method.
- */
- @Override
- protected Bitmap doInBackground(Integer... params) {
- try {
- position = params[0];
- if (isCancelled()) {
- return null;
- }
- Bitmap thumb = MediaStore.Images.Thumbnails.getThumbnail(mContext.getContentResolver(), position, 12345,
- MediaStore.Images.Thumbnails.MINI_KIND, null);
- if (isCancelled()) {
- return null;
- }
- if (thumb == null) {
- return null;
- } else {
- if (isCancelled()) {
- return null;
- } else {
- if (rotate != 0) {
- Matrix matrix = new Matrix();
- matrix.setRotate(rotate);
- thumb = Bitmap.createBitmap(thumb, 0, 0, thumb.getWidth(), thumb.getHeight(), matrix, true);
- }
- return thumb;
- }
- }
- }catch(OutOfMemoryError error) {
- clearCache();
- return null;
- }
-
- }
-
- private void setInvisible() {
- // Log.d("COLLAGE", "Setting something invisible...");
- if (imageViewReference != null) {
- final ImageView imageView = imageViewReference.get();
- BitmapFetcherTask bitmapDownloaderTask = getBitmapDownloaderTask(imageView);
- if (this == bitmapDownloaderTask) {
- imageView.setVisibility(View.GONE);
- imageView.setClickable(false);
- imageView.setEnabled(false);
- }
- }
- }
-
- /**
- * Once the image is downloaded, associates it to the imageView
- */
- @Override
- protected void onPostExecute(Bitmap bitmap) {
- if (isCancelled()) {
- bitmap = null;
- }
- addBitmapToCache(position, bitmap);
- if (imageViewReference != null) {
- ImageView imageView = imageViewReference.get();
- BitmapFetcherTask bitmapDownloaderTask = getBitmapDownloaderTask(imageView);
- if (this == bitmapDownloaderTask) {
- imageView.setImageBitmap(bitmap);
- Animation anim = AnimationUtils.loadAnimation(imageView.getContext(), android.R.anim.fade_in);
- imageView.setAnimation(anim);
- anim.start();
- }
- } else {
- setInvisible();
- }
- }
- }
-
- /**
- * A fake Drawable that will be attached to the imageView while the download
- * is in progress.
- *
- *
- * Contains a reference to the actual download task, so that a download task
- * can be stopped if a new binding is required, and makes sure that only the
- * last started download process can bind its result, independently of the
- * download finish order.
- *
- */
- static class DownloadedDrawable extends ColorDrawable {
- private final WeakReference bitmapDownloaderTaskReference;
- private long origId;
-
- public DownloadedDrawable(Context mContext, BitmapFetcherTask bitmapDownloaderTask, long origId) {
- super(Color.TRANSPARENT);
- bitmapDownloaderTaskReference = new WeakReference(bitmapDownloaderTask);
- this.origId = origId;
- }
-
- public long getOrigId() {
- return origId;
- }
-
- public BitmapFetcherTask getBitmapDownloaderTask() {
- return bitmapDownloaderTaskReference.get();
- }
- }
-
- /*
- * Cache-related fields and methods.
- *
- * We use a hard and a soft cache. A soft reference cache is too aggressively cleared by the
- * Garbage Collector.
- */
-
- private static final int HARD_CACHE_CAPACITY = 100;
- private static final int DELAY_BEFORE_PURGE = 10 * 1000; // in milliseconds
-
- // Hard cache, with a fixed maximum capacity and a life duration
- private final HashMap sHardBitmapCache = new LinkedHashMap(
- HARD_CACHE_CAPACITY / 2, 0.75f, true) {
- @Override
- protected boolean removeEldestEntry(HashMap.Entry eldest) {
- if (size() > HARD_CACHE_CAPACITY) {
- // Entries push-out of hard reference cache are transferred to
- // soft reference cache
- sSoftBitmapCache.put(eldest.getKey(), new SoftReference(eldest.getValue()));
- return true;
- } else
- return false;
- }
- };
-
- // Soft cache for bitmaps kicked out of hard cache
- private final static ConcurrentHashMap> sSoftBitmapCache = new ConcurrentHashMap>(
- HARD_CACHE_CAPACITY / 2);
-
- private final Handler purgeHandler = new Handler();
-
- private final Runnable purger = new Runnable() {
- public void run() {
- clearCache();
- }
- };
-
- /**
- * Adds this bitmap to the cache.
- *
- * @param bitmap
- * The newly downloaded bitmap.
- */
- private void addBitmapToCache(Integer position, Bitmap bitmap) {
- if (bitmap != null) {
- synchronized (sHardBitmapCache) {
- sHardBitmapCache.put(position, bitmap);
- }
- }
- }
-
- /**
- * @param position
- * The URL of the image that will be retrieved from the cache.
- * @return The cached bitmap or null if it was not found.
- */
- private Bitmap getBitmapFromCache(Integer position) {
- // First try the hard reference cache
- synchronized (sHardBitmapCache) {
- final Bitmap bitmap = sHardBitmapCache.get(position);
- if (bitmap != null) {
- // Log.d("CACHE ****** ", "Hard hit!");
- // Bitmap found in hard cache
- // Move element to first position, so that it is removed last
- return bitmap;
- }
- }
-
- // Then try the soft reference cache
- SoftReference bitmapReference = sSoftBitmapCache.get(position);
- if (bitmapReference != null) {
- final Bitmap bitmap = bitmapReference.get();
- if (bitmap != null) {
- // Bitmap found in soft cache
- // Log.d("CACHE ****** ", "Soft hit!");
- return bitmap;
- } else {
- // Soft reference has been Garbage Collected
- sSoftBitmapCache.remove(position);
- }
- }
-
- return null;
- }
-
- /**
- * Clears the image cache used internally to improve performance. Note that
- * for memory efficiency reasons, the cache will automatically be cleared
- * after a certain inactivity delay.
- */
- public void clearCache() {
- sHardBitmapCache.clear();
- sSoftBitmapCache.clear();
- }
-
- /**
- * Allow a new delay before the automatic cache clear is done.
- */
- private void resetPurgeTimer() {
- // purgeHandler.removeCallbacks(purger);
- // purgeHandler.postDelayed(purger, DELAY_BEFORE_PURGE);
- }
-}
diff --git a/src/android/Library/src/MultiImageChooserActivity.java b/src/android/Library/src/MultiImageChooserActivity.java
deleted file mode 100644
index 1e48bf07..00000000
--- a/src/android/Library/src/MultiImageChooserActivity.java
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * Copyright (c) 2012, David Erosa
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDIN G NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE
- *
- * Code modified by Andrew Stephan for Sync OnSet
- *
- */
-
-package com.synconset;
-
-import java.net.URI;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import com.synconset.FakeR;
-import android.app.AlertDialog;
-import android.app.LoaderManager;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.CursorLoader;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.Loader;
-import android.content.pm.ActivityInfo;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Base64;
-import android.util.SparseBooleanArray;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.ImageView;
-
-public class MultiImageChooserActivity extends AppCompatActivity implements
- OnItemClickListener,
- LoaderManager.LoaderCallbacks {
-
- private static final String TAG = "ImagePicker";
-
- public static final int NOLIMIT = -1;
- public static final String MAX_IMAGES_KEY = "MAX_IMAGES";
- public static final String WIDTH_KEY = "WIDTH";
- public static final String HEIGHT_KEY = "HEIGHT";
- public static final String QUALITY_KEY = "QUALITY";
- public static final String OUTPUT_TYPE_KEY = "OUTPUT_TYPE";
-
- private ImageAdapter ia;
-
- private Cursor imagecursor, actualimagecursor;
- private int image_column_index, image_column_orientation, actual_image_column_index, orientation_column_index;
- private int colWidth;
-
- private static final int CURSORLOADER_THUMBS = 0;
- private static final int CURSORLOADER_REAL = 1;
-
- private Map fileNames = new HashMap();
-
- private SparseBooleanArray checkStatus = new SparseBooleanArray();
-
- private int maxImages;
- private int maxImageCount;
-
- private int desiredWidth;
- private int desiredHeight;
- private int quality;
- private OutputType outputType;
-
- private final ImageFetcher fetcher = new ImageFetcher();
-
- private int selectedColor = 0xff32b2e1;
- private boolean shouldRequestThumb = true;
-
- private FakeR fakeR;
- private View abDoneView;
- private View abDiscardView;
-
- private ProgressDialog progress;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- fakeR = new FakeR(this);
- setContentView(fakeR.getId("layout", "multiselectorgrid"));
- fileNames.clear();
-
- maxImages = getIntent().getIntExtra(MAX_IMAGES_KEY, NOLIMIT);
- desiredWidth = getIntent().getIntExtra(WIDTH_KEY, 0);
- desiredHeight = getIntent().getIntExtra(HEIGHT_KEY, 0);
- quality = getIntent().getIntExtra(QUALITY_KEY, 0);
- maxImageCount = maxImages;
- outputType = OutputType.fromValue(getIntent().getIntExtra(OUTPUT_TYPE_KEY, 0));
-
- Display display = getWindowManager().getDefaultDisplay();
- int width = display.getWidth();
-
- colWidth = width / 4;
-
- GridView gridView = (GridView) findViewById(fakeR.getId("id", "gridview"));
- gridView.setOnItemClickListener(this);
- gridView.setOnScrollListener(new OnScrollListener() {
- private int lastFirstItem = 0;
- private long timestamp = System.currentTimeMillis();
-
- @Override
- public void onScrollStateChanged(AbsListView view, int scrollState) {
- if (scrollState == SCROLL_STATE_IDLE) {
- shouldRequestThumb = true;
- ia.notifyDataSetChanged();
- }
- }
-
- @Override
- public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
- float dt = System.currentTimeMillis() - timestamp;
- if (firstVisibleItem != lastFirstItem) {
- double speed = 1 / dt * 1000;
- lastFirstItem = firstVisibleItem;
- timestamp = System.currentTimeMillis();
-
- // Limit if we go faster than a page a second
- shouldRequestThumb = speed < visibleItemCount;
- }
- }
- });
-
- ia = new ImageAdapter();
- gridView.setAdapter(ia);
-
- LoaderManager.enableDebugLogging(false);
- getLoaderManager().initLoader(CURSORLOADER_THUMBS, null, this);
- getLoaderManager().initLoader(CURSORLOADER_REAL, null, this);
- setupHeader();
- updateAcceptButton();
- progress = new ProgressDialog(this);
- progress.setTitle(getString(fakeR.getId("string", "multi_image_picker_processing_images_title")));
- progress.setMessage(getString(fakeR.getId("string", "multi_image_picker_processing_images_message")));
- }
-
- @Override
- public void onItemClick(AdapterView arg0, View view, int position, long id) {
- String name = getImageName(position);
- int rotation = getImageRotation(position);
-
- if (name == null) {
- return;
- }
-
- boolean isChecked = !isChecked(position);
-
- if (maxImages == 0 && isChecked) {
- isChecked = false;
- new AlertDialog.Builder(this)
- .setTitle("Maximum " + maxImageCount + " Photos")
- .setMessage("You can only select " + maxImageCount + " photos at a time.")
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- })
- .create()
- .show();
-
- } else if (isChecked) {
- fileNames.put(name, rotation);
-
- if (maxImageCount == 1) {
- selectClicked();
-
- } else {
- maxImages--;
- ImageView imageView = (ImageView) view;
-
- if (android.os.Build.VERSION.SDK_INT >= 16) {
- imageView.setImageAlpha(128);
- } else {
- imageView.setAlpha(128);
- }
-
- view.setBackgroundColor(selectedColor);
- }
- } else {
- fileNames.remove(name);
- maxImages++;
- ImageView imageView = (ImageView) view;
-
- if (android.os.Build.VERSION.SDK_INT >= 16) {
- imageView.setImageAlpha(255);
- } else {
- imageView.setAlpha(255);
- }
-
- view.setBackgroundColor(Color.TRANSPARENT);
- }
-
- checkStatus.put(position, isChecked);
- updateAcceptButton();
- }
-
- @Override
- public Loader onCreateLoader(int cursorID, Bundle arg1) {
- ArrayList img = new ArrayList();
- switch (cursorID) {
- case CURSORLOADER_THUMBS:
- img.add(MediaStore.Images.Media._ID);
- img.add(MediaStore.Images.Media.ORIENTATION);
- break;
-
- case CURSORLOADER_REAL:
- img.add(MediaStore.Images.Thumbnails.DATA);
- img.add(MediaStore.Images.Media.ORIENTATION);
- break;
- }
-
- return new CursorLoader(
- this,
- MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
- img.toArray(new String[img.size()]),
- null,
- null,
- "DATE_MODIFIED DESC"
- );
- }
-
- @Override
- public void onLoadFinished(Loader loader, Cursor cursor) {
- if (cursor == null) {
- // NULL cursor. This usually means there's no image database yet....
- return;
- }
-
- switch (loader.getId()) {
- case CURSORLOADER_THUMBS:
- imagecursor = cursor;
- image_column_index = imagecursor.getColumnIndex(MediaStore.Images.Media._ID);
- image_column_orientation = imagecursor.getColumnIndex(MediaStore.Images.Media.ORIENTATION);
- ia.notifyDataSetChanged();
- break;
-
- case CURSORLOADER_REAL:
- actualimagecursor = cursor;
- actual_image_column_index = actualimagecursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
- orientation_column_index = actualimagecursor.getColumnIndexOrThrow(MediaStore.Images.Media.ORIENTATION);
- break;
- }
- }
-
- @Override
- public void onLoaderReset(Loader loader) {
- switch (loader.getId()) {
- case CURSORLOADER_THUMBS:
- imagecursor = null;
- break;
-
- case CURSORLOADER_REAL:
- actualimagecursor = null;
- break;
- }
- }
-
- public void cancelClicked() {
- setResult(RESULT_CANCELED);
- finish();
- }
-
- public void selectClicked() {
- abDiscardView.setEnabled(false);
- abDoneView.setEnabled(false);
- progress.show();
-
- if (fileNames.isEmpty()) {
- setResult(RESULT_CANCELED);
- progress.dismiss();
- finish();
- } else {
- setRequestedOrientation(getResources().getConfiguration().orientation); //prevent orientation changes during processing
- new ResizeImagesTask().execute(fileNames.entrySet());
- }
- }
-
-
- /*********************
- * Helper Methods
- ********************/
- private void updateAcceptButton() {
- if (abDoneView != null) {
- abDoneView.setEnabled(fileNames.size() != 0);
- }
- }
-
- private void setupHeader() {
- // From Roman Nkk's code
- // https://plus.google.com/113735310430199015092/posts/R49wVvcDoEW
- // Inflate a "Done/Discard" custom action bar view
- /*
- * Copyright 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
- View customActionBarView = inflater.inflate(
- fakeR.getId("layout", "actionbar_custom_view_done_discard"),
- null
- );
-
- abDoneView = customActionBarView.findViewById(fakeR.getId("id", "actionbar_done"));
- abDoneView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- // "Done"
- selectClicked();
- }
- });
-
- abDiscardView = customActionBarView.findViewById(fakeR.getId("id", "actionbar_discard"));
- abDiscardView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- cancelClicked();
- }
- });
-
- // Show the custom action bar view and hide the normal Home icon and title.
- ActionBar actionBar = getSupportActionBar();
- if (actionBar != null) {
- actionBar.setDisplayOptions(
- ActionBar.DISPLAY_SHOW_CUSTOM,
- ActionBar.DISPLAY_SHOW_CUSTOM
- | ActionBar.DISPLAY_SHOW_HOME
- | ActionBar.DISPLAY_SHOW_TITLE
- );
- actionBar.setCustomView(customActionBarView, new ActionBar.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.MATCH_PARENT
- ));
- }
- }
-
- private String getImageName(int position) {
- actualimagecursor.moveToPosition(position);
- String name = null;
-
- try {
- name = actualimagecursor.getString(actual_image_column_index);
- } catch (Exception e) {
- // Do something?
- }
-
- return name;
- }
-
- private int getImageRotation(int position) {
- actualimagecursor.moveToPosition(position);
- int rotation = 0;
-
- try {
- rotation = actualimagecursor.getInt(orientation_column_index);
- } catch (Exception e) {
- // Do something?
- }
-
- return rotation;
- }
-
- public boolean isChecked(int position) {
- return checkStatus.get(position);
- }
-
-
- /*********************
- * Nested Classes
- ********************/
- private class SquareImageView extends ImageView {
- public SquareImageView(Context context) {
- super(context);
- }
-
- @Override
- public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, widthMeasureSpec);
- }
- }
-
-
- private class ImageAdapter extends BaseAdapter {
-
- public int getCount() {
- if (imagecursor != null) {
- return imagecursor.getCount();
- } else {
- return 0;
- }
- }
-
- public Object getItem(int position) {
- return position;
- }
-
- public long getItemId(int position) {
- return position;
- }
-
- // create a new ImageView for each item referenced by the Adapter
- public View getView(int position, View convertView, ViewGroup parent) {
-
- if (convertView == null) {
- ImageView temp = new SquareImageView(MultiImageChooserActivity.this);
- temp.setScaleType(ImageView.ScaleType.CENTER_CROP);
- convertView = temp;
- }
-
- ImageView imageView = (ImageView) convertView;
- imageView.setImageBitmap(null);
-
- if (!imagecursor.moveToPosition(position)) {
- return imageView;
- }
-
- if (image_column_index == -1) {
- return imageView;
- }
-
- final int id = imagecursor.getInt(image_column_index);
- final int rotate = imagecursor.getInt(image_column_orientation);
-
- if (isChecked(position)) {
- if (android.os.Build.VERSION.SDK_INT >= 16) {
- imageView.setImageAlpha(128);
- } else {
- imageView.setAlpha(128);
- }
-
- imageView.setBackgroundColor(selectedColor);
-
- } else {
- if (android.os.Build.VERSION.SDK_INT >= 16) {
- imageView.setImageAlpha(255);
- } else {
- imageView.setAlpha(255);
- }
- imageView.setBackgroundColor(Color.TRANSPARENT);
- }
-
- if (shouldRequestThumb) {
- fetcher.fetch(id, imageView, colWidth, rotate);
- }
-
- return imageView;
- }
- }
-
- private class ResizeImagesTask extends AsyncTask>, Void, ArrayList> {
- private Exception asyncTaskError = null;
-
- @Override
- protected ArrayList doInBackground(Set>... fileSets) {
- Set> fileNames = fileSets[0];
- ArrayList al = new ArrayList();
- try {
- Iterator> i = fileNames.iterator();
- Bitmap bmp;
- while (i.hasNext()) {
- Entry imageInfo = i.next();
- File file = new File(imageInfo.getKey());
- int rotate = imageInfo.getValue();
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inSampleSize = 1;
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeFile(file.getAbsolutePath(), options);
- int width = options.outWidth;
- int height = options.outHeight;
- float scale = calculateScale(width, height);
-
- if (scale < 1) {
- int finalWidth = (int)(width * scale);
- int finalHeight = (int)(height * scale);
- int inSampleSize = calculateInSampleSize(options, finalWidth, finalHeight);
- options = new BitmapFactory.Options();
- options.inSampleSize = inSampleSize;
-
- try {
- bmp = this.tryToGetBitmap(file, options, rotate, true);
- } catch (OutOfMemoryError e) {
- options.inSampleSize = calculateNextSampleSize(options.inSampleSize);
- try {
- bmp = this.tryToGetBitmap(file, options, rotate, false);
- } catch (OutOfMemoryError e2) {
- throw new IOException("Unable to load image into memory.");
- }
- }
- } else {
- try {
- bmp = this.tryToGetBitmap(file, null, rotate, false);
- } catch(OutOfMemoryError e) {
- options = new BitmapFactory.Options();
- options.inSampleSize = 2;
-
- try {
- bmp = this.tryToGetBitmap(file, options, rotate, false);
- } catch(OutOfMemoryError e2) {
- options = new BitmapFactory.Options();
- options.inSampleSize = 4;
-
- try {
- bmp = this.tryToGetBitmap(file, options, rotate, false);
- } catch (OutOfMemoryError e3) {
- throw new IOException("Unable to load image into memory.");
- }
- }
- }
- }
-
- if (outputType == OutputType.FILE_URI) {
- file = storeImage(bmp, file.getName());
- al.add(Uri.fromFile(file).toString());
-
- } else if (outputType == OutputType.BASE64_STRING) {
- al.add(getBase64OfImage(bmp));
- }
- }
- return al;
- } catch (IOException e) {
- try {
- asyncTaskError = e;
- for (int i = 0; i < al.size(); i++) {
- URI uri = new URI(al.get(i));
- File file = new File(uri);
- file.delete();
- }
- } catch (Exception ignore) {
- }
-
- return new ArrayList();
- }
- }
-
- @Override
- protected void onPostExecute(ArrayList al) {
- Intent data = new Intent();
-
- if (asyncTaskError != null) {
- Bundle res = new Bundle();
- res.putString("ERRORMESSAGE", asyncTaskError.getMessage());
- data.putExtras(res);
- setResult(RESULT_CANCELED, data);
-
- } else if (al.size() > 0) {
- Bundle res = new Bundle();
- res.putStringArrayList("MULTIPLEFILENAMES", al);
-
- if (imagecursor != null) {
- res.putInt("TOTALFILES", imagecursor.getCount());
- }
-
- int sync = ResultIPC.get().setLargeData(res);
- data.putExtra("bigdata:synccode", sync);
- setResult(RESULT_OK, data);
-
- } else {
- setResult(RESULT_CANCELED, data);
- }
-
- progress.dismiss();
- finish();
- }
-
- private Bitmap tryToGetBitmap(File file,
- BitmapFactory.Options options,
- int rotate,
- boolean shouldScale) throws IOException, OutOfMemoryError {
- Bitmap bmp;
- if (options == null) {
- bmp = BitmapFactory.decodeFile(file.getAbsolutePath());
- } else {
- bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
- }
-
- if (bmp == null) {
- throw new IOException("The image file could not be opened.");
- }
-
- if (options != null && shouldScale) {
- float scale = calculateScale(options.outWidth, options.outHeight);
- bmp = this.getResizedBitmap(bmp, scale);
- }
-
- if (rotate != 0) {
- Matrix matrix = new Matrix();
- matrix.setRotate(rotate);
- bmp = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), matrix, true);
- }
-
- return bmp;
- }
-
- /*
- * The following functions are originally from
- * https://github.com/raananw/PhoneGap-Image-Resizer
- *
- * They have been modified by Andrew Stephan for Sync OnSet
- *
- * The software is open source, MIT Licensed.
- * Copyright (C) 2012, webXells GmbH All Rights Reserved.
- */
- private File storeImage(Bitmap bmp, String fileName) throws IOException {
- int index = fileName.lastIndexOf('.');
- String name = fileName.substring(0, index);
- String ext = fileName.substring(index);
- File file = File.createTempFile("tmp_" + name, ext);
- OutputStream outStream = new FileOutputStream(file);
-
- if (ext.compareToIgnoreCase(".png") == 0) {
- bmp.compress(Bitmap.CompressFormat.PNG, quality, outStream);
- } else {
- bmp.compress(Bitmap.CompressFormat.JPEG, quality, outStream);
- }
-
- outStream.flush();
- outStream.close();
- return file;
- }
-
- private Bitmap getResizedBitmap(Bitmap bm, float factor) {
- int width = bm.getWidth();
- int height = bm.getHeight();
- // create a matrix for the manipulation
- Matrix matrix = new Matrix();
- // resize the bit map
- matrix.postScale(factor, factor);
- // recreate the new Bitmap
- return Bitmap.createBitmap(bm, 0, 0, width, height, matrix, false);
- }
-
- private String getBase64OfImage(Bitmap bm) {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- bm.compress(Bitmap.CompressFormat.JPEG, quality, byteArrayOutputStream);
- byte[] byteArray = byteArrayOutputStream.toByteArray();
- return Base64.encodeToString(byteArray, Base64.NO_WRAP);
- }
- }
-
- private int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
- // Raw height and width of image
- final int height = options.outHeight;
- final int width = options.outWidth;
- int inSampleSize = 1;
-
- if (height > reqHeight || width > reqWidth) {
- final int halfHeight = height / 2;
- final int halfWidth = width / 2;
-
- // Calculate the largest inSampleSize value that is a power of 2 and keeps both
- // height and width larger than the requested height and width.
- while ((halfHeight / inSampleSize) > reqHeight && (halfWidth / inSampleSize) > reqWidth) {
- inSampleSize *= 2;
- }
- }
-
- return inSampleSize;
- }
-
- private int calculateNextSampleSize(int sampleSize) {
- double logBaseTwo = (int)(Math.log(sampleSize) / Math.log(2));
- return (int)Math.pow(logBaseTwo + 1, 2);
- }
-
- private float calculateScale(int width, int height) {
- float widthScale = 1.0f;
- float heightScale = 1.0f;
- float scale = 1.0f;
- if (desiredWidth > 0 || desiredHeight > 0) {
- if (desiredHeight == 0 && desiredWidth < width) {
- scale = (float)desiredWidth/width;
-
- } else if (desiredWidth == 0 && desiredHeight < height) {
- scale = (float)desiredHeight/height;
-
- } else {
- if (desiredWidth > 0 && desiredWidth < width) {
- widthScale = (float)desiredWidth/width;
- }
-
- if (desiredHeight > 0 && desiredHeight < height) {
- heightScale = (float)desiredHeight/height;
- }
-
- if (widthScale < heightScale) {
- scale = widthScale;
- } else {
- scale = heightScale;
- }
- }
- }
-
- return scale;
- }
-
- enum OutputType {
-
- FILE_URI(0), BASE64_STRING(1);
-
- int value;
-
- OutputType(int value) {
- this.value = value;
- }
-
- public static OutputType fromValue(int value) {
- for (OutputType type : OutputType.values()) {
- if (type.value == value) {
- return type;
- }
- }
- throw new IllegalArgumentException("Invalid enum value specified");
- }
- }
-}
diff --git a/src/android/com/synconset/ImagePicker/FakeR.java b/src/android/com/synconset/ImagePicker/FakeR.java
deleted file mode 100644
index 465b64f5..00000000
--- a/src/android/com/synconset/ImagePicker/FakeR.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-The MIT License
-
-Copyright (c) 2010 Matt Kane
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Code taken from: https://github.com/wildabeast/BarcodeScanner
-*/
-package com.synconset;
-
-import android.app.Activity;
-import android.content.Context;
-
-/**
- * R replacement for PhoneGap Build.
- *
- * ([^.\w])R\.(\w+)\.(\w+)
- * $1fakeR("$2", "$3")
- *
- * @author Maciej Nux Jaros
- */
-public class FakeR {
- private Context context;
- private String packageName;
-
- public FakeR(Activity activity) {
- context = activity.getApplicationContext();
- packageName = context.getPackageName();
- }
-
- public FakeR(Context context) {
- this.context = context;
- packageName = context.getPackageName();
- }
-
- public int getId(String group, String key) {
- return context.getResources().getIdentifier(key, group, packageName);
- }
-
- public static int getId(Context context, String group, String key) {
- return context.getResources().getIdentifier(key, group, context.getPackageName());
- }
-}
diff --git a/src/android/com/synconset/ImagePicker/ImagePicker.java b/src/android/com/synconset/ImagePicker/ImagePicker.java
deleted file mode 100644
index b534736a..00000000
--- a/src/android/com/synconset/ImagePicker/ImagePicker.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * An Image Picker Plugin for Cordova/PhoneGap.
- */
-package com.synconset;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaPlugin;
-
-import org.apache.cordova.PluginResult;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-
-public class ImagePicker extends CordovaPlugin {
-
- private static final String ACTION_GET_PICTURES = "getPictures";
- private static final String ACTION_HAS_READ_PERMISSION = "hasReadPermission";
- private static final String ACTION_REQUEST_READ_PERMISSION = "requestReadPermission";
-
- private static final int PERMISSION_REQUEST_CODE = 100;
-
- private CallbackContext callbackContext;
-
- public boolean execute(String action, final JSONArray args, final CallbackContext callbackContext) throws JSONException {
- this.callbackContext = callbackContext;
-
- if (ACTION_HAS_READ_PERMISSION.equals(action)) {
- callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, hasReadPermission()));
- return true;
-
- } else if (ACTION_REQUEST_READ_PERMISSION.equals(action)) {
- requestReadPermission();
- return true;
-
- } else if (ACTION_GET_PICTURES.equals(action)) {
- final JSONObject params = args.getJSONObject(0);
- final Intent imagePickerIntent = new Intent(cordova.getActivity(), MultiImageChooserActivity.class);
- int max = 20;
- int desiredWidth = 0;
- int desiredHeight = 0;
- int quality = 100;
- int outputType = 0;
- if (params.has("maximumImagesCount")) {
- max = params.getInt("maximumImagesCount");
- }
- if (params.has("width")) {
- desiredWidth = params.getInt("width");
- }
- if (params.has("height")) {
- desiredHeight = params.getInt("height");
- }
- if (params.has("quality")) {
- quality = params.getInt("quality");
- }
- if (params.has("outputType")) {
- outputType = params.getInt("outputType");
- }
-
- imagePickerIntent.putExtra("MAX_IMAGES", max);
- imagePickerIntent.putExtra("WIDTH", desiredWidth);
- imagePickerIntent.putExtra("HEIGHT", desiredHeight);
- imagePickerIntent.putExtra("QUALITY", quality);
- imagePickerIntent.putExtra("OUTPUT_TYPE", outputType);
-
- // some day, when everybody uses a cordova version supporting 'hasPermission', enable this:
- /*
- if (cordova != null) {
- if (cordova.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
- cordova.startActivityForResult(this, imagePickerIntent, 0);
- } else {
- cordova.requestPermission(
- this,
- PERMISSION_REQUEST_CODE,
- Manifest.permission.READ_EXTERNAL_STORAGE
- );
- }
- }
- */
- // .. until then use:
- if (hasReadPermission()) {
- cordova.startActivityForResult(this, imagePickerIntent, 0);
- } else {
- requestReadPermission();
- // The downside is the user needs to re-invoke this picker method.
- // The best thing to do for the dev is check 'hasReadPermission' manually and
- // run 'requestReadPermission' or 'getPictures' based on the outcome.
- }
- return true;
- }
- return false;
- }
-
- @SuppressLint("InlinedApi")
- private boolean hasReadPermission() {
- return Build.VERSION.SDK_INT < 23 ||
- PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this.cordova.getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE);
- }
-
- @SuppressLint("InlinedApi")
- private void requestReadPermission() {
- if (!hasReadPermission()) {
- ActivityCompat.requestPermissions(
- this.cordova.getActivity(),
- new String[] {Manifest.permission.READ_EXTERNAL_STORAGE},
- PERMISSION_REQUEST_CODE);
- }
- // This method executes async and we seem to have no known way to receive the result
- // (that's why these methods were later added to Cordova), so simply returning ok now.
- callbackContext.success();
- }
-
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (resultCode == Activity.RESULT_OK && data != null) {
- int sync = data.getIntExtra("bigdata:synccode", -1);
- final Bundle bigData = ResultIPC.get().getLargeData(sync);
-
- ArrayList fileNames = bigData.getStringArrayList("MULTIPLEFILENAMES");
-
- JSONArray res = new JSONArray(fileNames);
- callbackContext.success(res);
-
- } else if (resultCode == Activity.RESULT_CANCELED && data != null) {
- String error = data.getStringExtra("ERRORMESSAGE");
- callbackContext.error(error);
-
- } else if (resultCode == Activity.RESULT_CANCELED) {
- JSONArray res = new JSONArray();
- callbackContext.success(res);
-
- } else {
- callbackContext.error("No images selected");
- }
- }
-
- /**
- * Choosing a picture launches another Activity, so we need to implement the
- * save/restore APIs to handle the case where the CordovaActivity is killed by the OS
- * before we get the launched Activity's result.
- *
- * @see http://cordova.apache.org/docs/en/dev/guide/platforms/android/plugin.html#launching-other-activities
- */
- public void onRestoreStateForActivityResult(Bundle state, CallbackContext callbackContext) {
- this.callbackContext = callbackContext;
- }
-
-/*
- @Override
- public void onRequestPermissionResult(int requestCode,
- String[] permissions,
- int[] grantResults) throws JSONException {
-
- // For now we just have one permission, so things can be kept simple...
- if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
- cordova.startActivityForResult(this, imagePickerIntent, 0);
- } else {
- // Tell the JS layer that something went wrong...
- callbackContext.error("Permission denied");
- }
- }
-*/
-}
diff --git a/src/android/com/synconset/ImagePicker/ResultIPC.java b/src/android/com/synconset/ImagePicker/ResultIPC.java
deleted file mode 100644
index 714dd2e6..00000000
--- a/src/android/com/synconset/ImagePicker/ResultIPC.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.synconset;
-
-import android.os.Bundle;
-
-public class ResultIPC {
-
- private static ResultIPC instance;
-
- public synchronized static ResultIPC get() {
- if (instance == null) {
- instance = new ResultIPC ();
- }
- return instance;
- }
-
- private int sync = 0;
-
- private Bundle largeData;
- public int setLargeData(Bundle largeData) {
- this.largeData = largeData;
- return ++sync;
- }
-
- public Bundle getLargeData(int request) {
- return (request == sync) ? largeData : null;
- }
-}
\ No newline at end of file
diff --git a/src/android/ignorelinterrors.gradle b/src/android/ignorelinterrors.gradle
deleted file mode 100644
index c1d8e4bc..00000000
--- a/src/android/ignorelinterrors.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-android {
- lintOptions {
- checkReleaseBuilds false
- }
-}
\ No newline at end of file
diff --git a/src/ios/GMImagePicker/GMGridViewController.m b/src/ios/GMImagePicker/GMGridViewController.m
index 6636eb72..a2e30208 100755
--- a/src/ios/GMImagePicker/GMGridViewController.m
+++ b/src/ios/GMImagePicker/GMGridViewController.m
@@ -11,7 +11,7 @@
#import "GMAlbumsViewController.h"
#import "GMGridViewCell.h"
#import "GMPHAsset.h"
-
+#import
//#import "PSYBlockTimer.h"
#import "GMFetchItem.h"
@@ -472,9 +472,14 @@ - (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtInde
}];
-
-
- [ self.imageManager requestImageForAsset:asset targetSize:PHImageManagerMaximumSize contentMode:PHImageContentModeDefault options:ph_options resultHandler:^(UIImage *result, NSDictionary *info) {
+ [[PHImageManager defaultManager] requestImageDataForAsset:asset
+ options:ph_options
+ resultHandler:
+ ^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
+ //CIImage* ciImage = [CIImage imageWithData:imageData];
+ //NSLog(@"Metadata : %@", ciImage.properties);
+
+ // [ self.imageManager requestImageForAsset:asset targetSize:PHImageManagerMaximumSize contentMode:PHImageContentModeDefault options:ph_options resultHandler:^(UIImage *result, NSDictionary *info) {
//dispatch_async(dispatch_get_main_queue(), ^{
@@ -487,35 +492,58 @@ - (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtInde
fetch_item.be_progressed = false;
fetch_item.be_finished = true;
+
+ NSString *fileName =[asset valueForKey:@"filename"];
+ NSString *fileExtension = [fileName pathExtension];
+ if ([fileExtension containsString:@"heic"]) {
+ CIImage *ciImage = [CIImage imageWithData:imageData];
+ NSData* data = [[[CIContext alloc] init] JPEGRepresentationOfImage:ciImage colorSpace:CGColorSpaceCreateDeviceRGB() options:@{}];
+ imageData = data;
+ fileExtension = @"jpg";
+ }
+
//asset.image_fullsize = result;
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+ NSString *libPath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"NoCloud"];
NSString * filePath;
do {
- filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_PHOTO_PREFIX, docCount++, @"jpg"];
+
+ filePath = [NSString stringWithFormat:@"%@/%@.%@", libPath, [[NSUUID UUID] UUIDString], [fileExtension lowercaseString]];
} while ([fileMgr fileExistsAtPath:filePath]);
fetch_item.be_saving_img = true;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ [imageData writeToFile:filePath atomically:YES];
// @BVL: Added orientation-fix to correctly display the returned result
// if ( ![ UIImageJPEGRepresentation(result, 1.0f ) writeToFile:filePath atomically:YES ] ) {
// return;
// }
-
+ /*
NSLog(@"original orientation: %ld",(UIImageOrientation)result.imageOrientation);
UIImage *imageToDisplay = result.fixOrientation; // UIImage+fixOrientation extension
NSLog(@"corrected orientation: %ld",(UIImageOrientation)imageToDisplay.imageOrientation);
-
- // setting compression to a low value (high compression) impact performance, but not actual img quality
- if ( ![ UIImageJPEGRepresentation(imageToDisplay, 0.2f ) writeToFile:filePath atomically:YES ] ) {
- return;
+
+ if (info[@"PHImageFileURLKey"]){
+ NSError* err;
+ [[NSFileManager defaultManager] copyItemAtPath:info[@"PHImageFileURLKey"] toPath:filePath error:&err];
+ if (err){
+ return NSLog(@"%@", err);
+ }
+ }else{
+ // setting compression to a low value (high compression) impact performance, but not actual img quality
+ if ( ![ UIImageJPEGRepresentation(imageToDisplay, 0.2f ) writeToFile:filePath atomically:YES ] ) {
+ return;
+ }
}
+ */
fetch_item.image_fullsize = filePath;
fetch_item.be_saving_img = false;
diff --git a/src/ios/SOSPicker.m b/src/ios/SOSPicker.m
index 0e2e00e7..b41e9d81 100644
--- a/src/ios/SOSPicker.m
+++ b/src/ios/SOSPicker.m
@@ -32,35 +32,23 @@ - (void) hasReadPermission:(CDVInvokedUrlCommand *)command {
}
- (void) requestReadPermission:(CDVInvokedUrlCommand *)command {
- // [PHPhotoLibrary requestAuthorization:]
- // this method works only when it is a first time, see
- // https://developer.apple.com/library/ios/documentation/Photos/Reference/PHPhotoLibrary_Class/
-
- PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus];
- if (status == PHAuthorizationStatusAuthorized) {
- NSLog(@"Access has been granted.");
-
- CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
- [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
- } else if (status == PHAuthorizationStatusDenied) {
- NSString* message = @"Access has been denied. Change your setting > this app > Photo enable";
- NSLog(@"%@", message);
-
- CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:message];
- [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
- } else if (status == PHAuthorizationStatusNotDetermined) {
- // Access has not been determined. requestAuthorization: is available
- [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {}];
-
- CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
- [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
- } else if (status == PHAuthorizationStatusRestricted) {
- NSString* message = @"Access has been restricted. Change your setting > Privacy > Photo enable";
- NSLog(@"%@", message);
-
- CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:message];
- [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+ [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus authStatus) {
+ NSString* status = [self getCameraRollAuthorizationStatusAsString:authStatus];
+ [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:status] callbackId:command.callbackId];
+ }];
+}
+
+- (NSString*) getCameraRollAuthorizationStatusAsString: (PHAuthorizationStatus)authStatus
+{
+ NSString* status;
+ if(authStatus == PHAuthorizationStatusDenied || authStatus == PHAuthorizationStatusRestricted){
+ status = @"denied";
+ }else if(authStatus == PHAuthorizationStatusNotDetermined ){
+ status = @"not_determined";
+ }else if(authStatus == PHAuthorizationStatusAuthorized){
+ status = @"authorized";
}
+ return status;
}
- (void) getPictures:(CDVInvokedUrlCommand *)command {
@@ -137,7 +125,7 @@ - (UIImage*)imageByScalingNotCroppingForSize:(UIImage*)anImage toSize:(CGSize)fr
scaledSize = CGSizeMake(floor(width * scaleFactor), floor(height * scaleFactor));
}
- UIGraphicsBeginImageContext(scaledSize); // this will resize
+ UIGraphicsBeginImageContextWithOptions(scaledSize, YES, 1.0); // this will resize
[sourceImage drawInRect:CGRectMake(0, 0, scaledSize.width, scaledSize.height)];
@@ -182,10 +170,10 @@ - (void)assetsPickerController:(GMImagePickerController *)picker didFinishPickin
NSMutableArray * result_all = [[NSMutableArray alloc] init];
CGSize targetSize = CGSizeMake(self.width, self.height);
NSFileManager* fileMgr = [[NSFileManager alloc] init];
- NSString* docsPath = [NSTemporaryDirectory()stringByStandardizingPath];
-
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+ NSString *libPath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"NoCloud"];
+
NSError* err = nil;
- int i = 1;
NSString* filePath;
CDVPluginResult* result = nil;
@@ -196,7 +184,7 @@ - (void)assetsPickerController:(GMImagePickerController *)picker didFinishPickin
}
do {
- filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_PHOTO_PREFIX, i++, @"jpg"];
+ filePath = [NSString stringWithFormat:@"%@/%@.%@", libPath, [[NSUUID UUID] UUIDString], @"jpg"];
} while ([fileMgr fileExistsAtPath:filePath]);
NSData* data = nil;
@@ -209,6 +197,7 @@ - (void)assetsPickerController:(GMImagePickerController *)picker didFinishPickin
if (self.quality == 100) {
// no scaling, no downsampling, this is the fastest option
[result_all addObject:item.image_fullsize];
+
} else {
// resample first
UIImage* image = [UIImage imageNamed:item.image_fullsize];