Fixed bug with media picked from gallery

* store media picked from gallery locally in mage's external app directory, instead of device public

Author: newmanw

CHANGELOG.md

@@ -3,14 +3,21 @@ All notable changes to this project will be documented in this file.
 Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
-## 5.1.1 (TBD)
+## 5.1.2 (TBD)
 
 * TBD
 
 ##### Features
 
 ##### Bug Fixes
 
+## [5.1.1](https://github.com/ngageoint/mage-android/releases/tag/5.1.1) (11-10-2016)
+
+##### Features
+
+##### Bug Fixes
+* Media picked from gallery stored in wrong location causing attachment failure in some cases.
+
 ## [5.1.0](https://github.com/ngageoint/mage-android/releases/tag/5.1.0) (08-11-2016)
 
 ##### Features

mage/build.gradle

@@ -89,7 +89,7 @@ dependencies {
     }
 
     //compile project(':sdk') // uncomment me to build locally
-    compile "mil.nga.giat.mage:sdk:5.1.0" // comment me to build locally
+    compile "mil.nga.giat.mage:sdk:5.1.1" // comment me to build locally
     compile "mil.nga.geopackage:geopackage-android:1.3.0"
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.android.support:support-v4:23.1.1'

mage/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mil.nga.giat.mage"
-    android:versionCode="20"
-    android:versionName="5.1.0">
+    android:versionCode="21"
+    android:versionName="5.1.1">
 
     <permission
         android:name="mil.nga.giat.mage.permission.MAPS_RECEIVE"

mage/src/main/java/mil/nga/giat/mage/observation/ObservationEditActivity.java

@@ -627,7 +627,9 @@ private void launchVideoIntent() {
 	private void launchGalleryIntent() {
 		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
 		intent.setType("image/*, video/*");
-		Log.i(LOG_NAME, "build version sdk int: " + Build.VERSION.SDK_INT);
+		intent.addCategory(Intent.CATEGORY_OPENABLE);
+		intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[] {"image/*", "video/*"});
+
 		if (Build.VERSION.SDK_INT >=  Build.VERSION_CODES.JELLY_BEAN_MR2) {
 			intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
 		}
@@ -752,9 +754,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 			case GALLERY_ACTIVITY_REQUEST_CODE:
 			case CAPTURE_VOICE_ACTIVITY_REQUEST_CODE:
 				Collection<Uri> uris = getUris(data);
+
 				for (Uri uri : uris) {
 					try {
-						File file = MediaUtility.copyImageFromGallery(getContentResolver().openInputStream(uri));
+						File file = MediaUtility.copyMediaFromUri(getApplicationContext(), uri);
 						Attachment a = new Attachment();
 						a.setLocalPath(file.getAbsolutePath());
 						attachmentsToCreate.add(a);

mage/src/main/java/mil/nga/giat/mage/profile/ProfileFragment.java

@@ -473,7 +473,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 				List<Uri> uris = getUris(data);
 				for (Uri uri : uris) {
 					try {
-						File avatarFile = MediaUtility.copyImageFromGallery(getActivity().getContentResolver().openInputStream(uri));
+						File avatarFile = MediaUtility.copyMediaFromUri(getActivity(),uri);
 						filePath = avatarFile.getAbsolutePath();
 					} catch (IOException e) {
 						Log.e(LOG_NAME, "Error copying gallery file for avatar to local storage", e);