BEEM-reviews: comparison app/src/main/java/com/beem/project/beem/ui/ChangeStatus.java

equal deleted inserted replaced

-:a2ec39a59c06
+:744a173ea554
 Head of the EIP Laboratory.
 */
 package com.beem.project.beem.ui;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.util.Log;
 private static final int SELECT_PHOTO_DLG = 0;
 private static final int CAMERA_WITH_DATA = 0;
 private static final int PHOTO_PICKED_WITH_DATA = 1;
+private static final int PHOTO_CROPPED = 2;
-private static final File PHOTO_DIR = new File(
-Environment.getExternalStorageDirectory() + "/DCIM/Camera");
-private static final String KEY_CURRENT_PHOTO_FILE = "currentphotofile";
-private static final Uri MY_AVATAR_URI = Uri.parse(AvatarProvider.CONTENT_URI + "/my_avatar");
 private EditText mStatusMessageEditText;
 private Toast mToast;
 private Button mOk;
 private Button mClear;
 private Button mContact;
 private Spinner mSpinner;
 private ImageButton mAvatar;
 private Uri mAvatarUri;
+private Bitmap avatarBitmap;
 private SharedPreferences mSettings;
 private ArrayAdapter<CharSequence> mAdapter;
 private IXmppFacade mXmppFacade;
 private final ServiceConnection mServConn = new BeemServiceConnection();
 private final OnClickListener mOnClickOk = new MyOnClickListener();
 private final BeemBroadcastReceiver mReceiver = new BeemBroadcastReceiver();
 private boolean mShowCurrentAvatar = true;
 private boolean mDisableAvatar;
-private File mCurrentPhotoFile;
 /**
 * Constructor.
 */
 public ChangeStatus() {
 	mSpinner.setSelection(getPreferenceStatusIndex());
 	this.registerReceiver(mReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
 }
-/**
-* {@inheritDoc}
-*/
 @Override
 protected void onResume() {
 	super.onResume();
 	if (!BeemConnectivity.isConnected(getApplicationContext())) {
 	    Intent i = new Intent(this, Login.class);
 	    finish();
 	}
 	bindService(new Intent(this, BeemService.class), mServConn, BIND_AUTO_CREATE);
 }
-/**
-* {@inheritDoc}
-*/
 @Override
 protected void onPause() {
 	super.onPause();
 	unbindService(mServConn);
 }
-/* (non-Javadoc)
-* @see android.app.Activity#onDestroy()
-*/
 @Override
 protected void onDestroy() {
 	super.onDestroy();
 	this.unregisterReceiver(mReceiver);
 }
-/*
-* The activity is often reclaimed by the system memory.
-*/
-@Override
-protected void onSaveInstanceState(Bundle outState) {
-if (mCurrentPhotoFile != null) {
-outState.putString(KEY_CURRENT_PHOTO_FILE, mCurrentPhotoFile.toString());
-}
-super.onSaveInstanceState(outState);
-}
-@Override
-protected void onRestoreInstanceState(Bundle savedInstanceState) {
-String fileName = savedInstanceState.getString(KEY_CURRENT_PHOTO_FILE);
-if (fileName != null) {
-mCurrentPhotoFile = new File(fileName);
-}
-super.onRestoreInstanceState(savedInstanceState);
-}
 @Override
 protected Dialog onCreateDialog(int id) {
 	if (id == SELECT_PHOTO_DLG)
 	    return createPickPhotoDialog();
 	return null;
 }
 @Override
 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-	  // Ignore failed requests
+	// Ignore failed requests
-if (resultCode != RESULT_OK) return;
+	if (resultCode != RESULT_OK) return;
-switch (requestCode) {
+	switch (requestCode) {
-case PHOTO_PICKED_WITH_DATA:
+	    case PHOTO_PICKED_WITH_DATA:
-		// We tell the activity to put the result in MY_AVATAR_URI
+		mAvatarUri = data.getData();
-		mAvatarUri = MY_AVATAR_URI;
 		Log.d(TAG, "selected avatar uri " + mAvatarUri);
 		if (mAvatarUri != null) {
-		    // force reload of image even it is the same uri
-		    mAvatar.setImageURI(null);
 		    mAvatar.setImageURI(mAvatarUri);
 		    mDisableAvatar = false;
 		    mShowCurrentAvatar = false;
+		    avatarBitmap = null;
 		}
-break;
+		break;
+	    case CAMERA_WITH_DATA:
-case CAMERA_WITH_DATA:
+		if (!doCropPhoto(data.getData())) {
-doCropPhoto(mCurrentPhotoFile);
+		    mAvatarUri = data.getData();
-break;
+		    mAvatar.setImageURI(mAvatarUri);
+		    mDisableAvatar = false;
+		    mShowCurrentAvatar = false;
+		    avatarBitmap = null;
+		}
+		break;
+	    case PHOTO_CROPPED:
+		avatarBitmap = data.getParcelableExtra("data");
+		if (avatarBitmap != null) {
+		    mAvatar.setImageBitmap(avatarBitmap);
+		    mDisableAvatar = false;
+		    mShowCurrentAvatar = false;
+		    mAvatarUri = null;
+		}
+		break;
 	    default:
 		Log.w(TAG, "onActivityResult : invalid request code");
 }
 }
 /**
 * Return the status index from status the settings.
 	try {
 	    if (mDisableAvatar)
 		mXmppFacade.disableAvatarPublishing();
 	    else if (mAvatarUri != null)
 		mXmppFacade.publishAvatar(mAvatarUri);
+	    else if (avatarBitmap != null)
+		mXmppFacade.publishAvatarBitmap(avatarBitmap);
 	} catch (RemoteException e) {
 	    Log.e(TAG, "Error while publishing avatar", e);
 	}
 }
 }
 });
 return builder.create();
 }
-/**
-* Create a file name for the icon photo using current time.
-* @return the filename
-*/
-private String getPhotoFileName() {
-Date date = new Date(System.currentTimeMillis());
-SimpleDateFormat dateFormat = new SimpleDateFormat("'IMG'_yyyyMMdd_HHmmss");
-return dateFormat.format(date) + ".jpg";
-}
 /**
 * Launches Camera to take a picture and store it in a file.
 */
 protected void doTakePhoto() {
 try {
 // Launch camera to take photo for selected contact
-PHOTO_DIR.mkdirs();
+final Intent intent = getTakePickIntent();
-mCurrentPhotoFile = new File(PHOTO_DIR, getPhotoFileName());
-final Intent intent = getTakePickIntent(mCurrentPhotoFile);
 startActivityForResult(intent, CAMERA_WITH_DATA);
 } catch (ActivityNotFoundException e) {
 Toast.makeText(this, R.string.photoPickerNotFoundText, Toast.LENGTH_LONG).show();
 }
 }
 /**
 * Constructs an intent for capturing a photo and storing it in a temporary file.
-* @param f the temporary file to use to store the picture
 * @return the intent
 */
-public static Intent getTakePickIntent(File f) {
+public static Intent getTakePickIntent() {
 Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE, null);
-intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(f));
 return intent;
 }
 /**
 * Sends a newly acquired photo to Gallery for cropping.
-* @param f the image file to crop
+* @param uri the image file to crop
-*/
+* @return true if was able to launch a cropping activity
-protected void doCropPhoto(final File f) {
+*/
+protected boolean doCropPhoto(final Uri uri) {
 try {
-// Add the image to the media store
-	    // level 8
-	    /*
-MediaScannerConnection.scanFile(
-this,
-new String[] { f.getAbsolutePath() },
-new String[] { null },
-null);
-	    */
 // Launch gallery to crop the photo
-final Intent intent = getCropImageIntent(Uri.fromFile(f));
+final Intent intent = getCropImageIntent(uri);
-startActivityForResult(intent, PHOTO_PICKED_WITH_DATA);
+startActivityForResult(intent, PHOTO_CROPPED);
+return true;
 } catch (ActivityNotFoundException e) {
 Log.e(TAG, "Cannot crop image", e);
 Toast.makeText(this, R.string.photoPickerNotFoundText, Toast.LENGTH_LONG).show();
+return false;
 }
 }
 /**
 * Constructs an intent for image cropping.
 intent.putExtra("crop", "true");
 intent.putExtra("aspectX", 1);
 intent.putExtra("aspectY", 1);
 intent.putExtra("outputX", ICON_SIZE);
 intent.putExtra("outputY", ICON_SIZE);
-	intent.putExtra(MediaStore.EXTRA_OUTPUT, MY_AVATAR_URI);
+	intent.putExtra("return-data", true);
 return intent;
 }
 /**
 * Launches Gallery to pick a photo.
 intent.putExtra("crop", "true");
 intent.putExtra("aspectX", 1);
 intent.putExtra("aspectY", 1);
 intent.putExtra("outputX", ICON_SIZE);
 intent.putExtra("outputY", ICON_SIZE);
-	intent.putExtra(MediaStore.EXTRA_OUTPUT, MY_AVATAR_URI);
 	// use this to get the bitmap in the intent
-//         intent.putExtra("return-data", true);
+intent.putExtra("return-data", true);
 return intent;
 }

changeset 1070	744a173ea554
parent 1067	401b33f78a4d