Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc98ff91 authored by Paul Soulos's avatar Paul Soulos
Browse files

Fixes photo authority issues in Contacts 

bug: 17462942
Change-Id: Ie67a2a3643cddff7fe83f1a5571ef027617cfa74
parent bb28b101

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -722,4 +722,7 @@ 
    <!-- Prefix for messages that you sent [CHAR LIMIT=40] -->

    <string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>



     <!-- File Authority for the photo picker -->

    <string name="photo_file_provider_authority">com.android.contacts.files</string>



</resources>

src/com/android/contacts/util/ContactPhotoUtils.java

+7 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.provider.MediaStore; 
import android.support.v4.content.FileProvider;

import android.util.Log;



import com.android.contacts.R;

import com.google.common.io.Closeables;



import java.io.ByteArrayOutputStream;
@@ -49,8 +50,6 @@ public class ContactPhotoUtils { 


    private static final String PHOTO_DATE_FORMAT = "'IMG'_yyyyMMdd_HHmmss";



    public static final String FILE_PROVIDER_AUTHORITY = "com.android.contacts.files";



    /**

     * Generate a new, unique file to be used as an out-of-band communication

     * channel, since hi-res Bitmaps are too big to serialize into a Bundle.
@@ -58,12 +57,16 @@ public class ContactPhotoUtils { 
     *  cropper/etc.), and read by us once they are finished writing it.

     */

    public static Uri generateTempImageUri(Context context) {

        return FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY,

        final String  fileProviderAuthority = context.getResources().getString(

                R.string.photo_file_provider_authority);

        return FileProvider.getUriForFile(context, fileProviderAuthority,

                new File(pathForTempPhoto(context, generateTempPhotoFileName())));

    }



    public static Uri generateTempCroppedImageUri(Context context) {

        return FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY,

        final String  fileProviderAuthority = context.getResources().getString(

                R.string.photo_file_provider_authority);

        return FileProvider.getUriForFile(context, fileProviderAuthority,

                new File(pathForTempPhoto(context, generateTempCroppedPhotoFileName())));

    }