thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check if bitmap is null and clear pending uris when pressing cancel

Browse source
This commit is contained in:
Christian Schneppe 2016-06-28 19:07:51 +02:00
parent 8110a38049
commit 71e7f822d5
1 changed files with 70 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -1764,70 +1764,80 @@ public class ConversationActivity extends XmppActivity
String imagePath = FileUtils.getPath(this, uri);
Bitmap bitmap = BitmapFactory.decodeFile(imagePath);
int scaleSize = 400;
int originalWidth = bitmap.getWidth();
int originalHeight = bitmap.getHeight();
int newWidth = -1;
int newHeight = -1;
float multFactor = -1.0F;
if(originalHeight > originalWidth) {
newHeight = scaleSize ;
multFactor = (float) originalWidth/(float) originalHeight;
newWidth = (int) (newHeight*multFactor);
} else if(originalWidth > originalHeight) {
newWidth = scaleSize ;
multFactor = (float) originalHeight/ (float)originalWidth;
newHeight = (int) (newWidth*multFactor);
} else if(originalHeight == originalWidth) {
newHeight = scaleSize ;
newWidth = scaleSize ;
}
if (bitmap != null) {
int scaleSize = 400;
int originalWidth = bitmap.getWidth();
int originalHeight = bitmap.getHeight();
int newWidth = -1;
int newHeight = -1;
float multFactor = -1.0F;
if (originalHeight > originalWidth) {
newHeight = scaleSize;
multFactor = (float) originalWidth / (float) originalHeight;
newWidth = (int) (newHeight * multFactor);
} else if (originalWidth > originalHeight) {
newWidth = scaleSize;
multFactor = (float) originalHeight / (float) originalWidth;
newHeight = (int) (newWidth * multFactor);
} else if (originalHeight == originalWidth) {
newHeight = scaleSize;
newWidth = scaleSize;
}
Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, false);
ImageView ImagePreview = new ImageView(this);
LinearLayout.LayoutParams vp =
new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
ImagePreview.setLayoutParams(vp);
ImagePreview.setScaleType(ImageView.ScaleType.FIT_XY);
ImagePreview.setAdjustViewBounds(true);
ImagePreview.setImageBitmap(bitmap);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setView(ImagePreview);
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialog, final int which) {
final Toast prepareFileToast = Toast.makeText(getApplicationContext(), getText(R.string.preparing_image), Toast.LENGTH_LONG);
prepareFileToast.show();
xmppConnectionService.attachImageToConversation(conversation_preview, uri_preview,
new UiCallback<Message>() {
Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, false);
ImageView ImagePreview = new ImageView(this);
LinearLayout.LayoutParams vp =
new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
ImagePreview.setLayoutParams(vp);
ImagePreview.setScaleType(ImageView.ScaleType.FIT_XY);
ImagePreview.setAdjustViewBounds(true);
ImagePreview.setImageBitmap(bitmap);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setView(ImagePreview);
builder.setCancelable(false);
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialog, final int which) {
final Toast prepareFileToast = Toast.makeText(getApplicationContext(), getText(R.string.preparing_image), Toast.LENGTH_LONG);
prepareFileToast.show();
xmppConnectionService.attachImageToConversation(conversation_preview, uri_preview,
new UiCallback<Message>() {
@Override
public void userInputRequried(PendingIntent pi, Message object) {
hidePrepareFileToast(prepareFileToast);
}
@Override
public void userInputRequried(PendingIntent pi, Message object) {
hidePrepareFileToast(prepareFileToast);
}
@Override
public void success(Message message) {
hidePrepareFileToast(prepareFileToast);
xmppConnectionService.sendMessage(message);
}
@Override
public void success(Message message) {
hidePrepareFileToast(prepareFileToast);
xmppConnectionService.sendMessage(message);
}
@Override
public void error(final int error, Message message) {
hidePrepareFileToast(prepareFileToast);
runOnUiThread(new Runnable() {
@Override
public void run() {
replaceToast(getString(error));
}
});
}
});
}
});
//builder.setNegativeButton(R.string.cancel, null);
builder.create().show();
@Override
public void error(final int error, Message message) {
hidePrepareFileToast(prepareFileToast);
runOnUiThread(new Runnable() {
@Override
public void run() {
replaceToast(getString(error));
}
});
}
});
}
});
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialog, final int which) {
mPendingImageUris.clear();
}
});
builder.create().show();
} else {
Toast.makeText(getApplicationContext(), getText(R.string.error_file_not_found), Toast.LENGTH_LONG).show();
}
}
private void hidePrepareFileToast(final Toast prepareFileToast) {