Fix usage of getContext() on pre-M SDKs (2/2) (9bc9ba87) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/editor/CompactContactEditorFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment impl
		public void updatePhoto(Uri uri) throws FileNotFoundException {
		final Bitmap bitmap = ContactPhotoUtils.getBitmapFromUri(getActivity(), uri);
		if (bitmap == null \|\| bitmap.getHeight() <= 0 \|\| bitmap.getWidth() <= 0) {
		Toast.makeText(getContext(), R.string.contactPhotoSavedErrorToast,
		Toast.makeText(mContext, R.string.contactPhotoSavedErrorToast,
		Toast.LENGTH_SHORT).show();
		return;
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -226,14 +226,14 @@ public class CompactPhotoSelectionFragment extends Fragment {
		// Bind the photo
		final ImageView imageView = (ImageView) photoItemView.findViewById(R.id.image);
		if (photo.updatedPhotoUri != null) {
		EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(getContext()),
		EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(mContext),
		imageView, photo.updatedPhotoUri);
		} else {
		final Long photoFileId = EditorUiUtils.getPhotoFileId(photo.valuesDelta);
		if (photoFileId != null) {
		final Uri photoUri = ContactsContract.DisplayPhoto.CONTENT_URI.buildUpon()
		.appendPath(photoFileId.toString()).build();
		EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(getContext()),
		EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(mContext),
		imageView, photoUri);
		} else {
		imageView.setImageBitmap(EditorUiUtils.getPhotoBitmap(photo.valuesDelta));
		@@ -366,4 +366,9 @@ public class CompactPhotoSelectionFragment extends Fragment {
		return super.onOptionsItemSelected(item);
		}
		}

		@Override
		public Context getContext() {
		return getActivity();
		}
		}
		No newline at end of file

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.contacts.list;

		import android.app.Fragment;
		import android.content.Context;
		import android.graphics.PorterDuff;
		import android.os.Bundle;
		import android.provider.ContactsContract.ProviderStatus;
		@@ -157,4 +158,9 @@ public class ContactsUnavailableFragment extends Fragment implements OnClickList
		}
		}
		}

		@Override
		public Context getContext() {
		return getActivity();
		}
		}