Started to handle pictures in liblinphone message storage

src/org/linphone/ChatFragment.java

@@ -117,6 +117,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	private HashMap<Integer, String> latestImageMessages;
 	private int messagesFilterLimit = 0;
 	private List<ChatMessage> messagesList;
+	private boolean useLinphoneMessageStorage;
 	
 	private ProgressBar progressBar;
 	private int bytesSent;
@@ -136,6 +137,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		
         view = inflater.inflate(R.layout.chat, container, false);
         
+        useLinphoneMessageStorage = getResources().getBoolean(R.bool.use_linphone_chat_storage);
+        
         contactName = (TextView) view.findViewById(R.id.contactName);
         contactPicture = (AvatarWithShadow) view.findViewById(R.id.contactPicture);
         
@@ -406,7 +409,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 					public void run() {
 						final Bitmap bm = ChatFragment.downloadImage(url);
 						if (bm != null) {
-							LinphoneActivity.instance().getChatStorage().saveImage(finalId, bm);
+							if (useLinphoneMessageStorage) {
+								saveImage(bm, finalId);
+							} else {
+								LinphoneActivity.instance().getChatStorage().saveImage(finalId, bm);
+							}
 							mHandler.post(new Runnable() {
 								@Override
 								public void run() {
@@ -468,7 +475,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			menu.add(v.getId(), MENU_DELETE_MESSAGE, 0, getString(R.string.delete));
 			ImageView iv = (ImageView) v.findViewById(R.id.image);
 			if (iv != null && iv.getVisibility() == View.VISIBLE) {
-				menu.add(v.getId(), MENU_SAVE_PICTURE, 0, getString(R.string.save_picture));
+				if (!useLinphoneMessageStorage) {
+					menu.add(v.getId(), MENU_SAVE_PICTURE, 0, getString(R.string.save_picture));
+				}
 			} else {
 				menu.add(v.getId(), MENU_COPY_TEXT, 0, getString(R.string.copy_text));
 			}
@@ -623,23 +632,22 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 					}
 				});
 			} else if (message.getExternalBodyUrl() != null) {
-				byte[] rawImage = LinphoneActivity.instance().getChatStorage().getRawImageFromMessage(id);
+				Bitmap bm = null;
-				if (rawImage == null) {
+				if (useLinphoneMessageStorage) {
-					mHandler.post(new Runnable() {
+					//TODO: Try to read image from file
-						@Override
-						public void run() {
-							displayImageMessage(id, null, String.valueOf(message.getTime()), true, null, messagesLayout, message.getExternalBodyUrl());
-						}
-					});
 				} else {
-					final Bitmap bm = BitmapFactory.decodeByteArray(rawImage, 0, rawImage.length);
+					byte[] rawImage = LinphoneActivity.instance().getChatStorage().getRawImageFromMessage(id);
-					mHandler.post(new Runnable() {
+					if (rawImage != null) {
-						@Override
+						bm = BitmapFactory.decodeByteArray(rawImage, 0, rawImage.length);
-						public void run() {
+					}
-							displayImageMessage(id, bm, String.valueOf(message.getTime()), true, null, messagesLayout, "");
-						}
-					});
 				}
+				final Bitmap fbm = bm;
+				mHandler.post(new Runnable() {
+					@Override
+					public void run() {
+						displayImageMessage(id, fbm, String.valueOf(message.getTime()), true, null, messagesLayout, fbm == null ? "" : message.getExternalBodyUrl());
+					}
+				});
 			}
 			scrollToEnd();
 		}
@@ -727,10 +735,17 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	}
 	
 	private void saveImage(int id) {
+		byte[] rawImage = LinphoneActivity.instance().getChatStorage().getRawImageFromMessage(id);
+		Bitmap bm = BitmapFactory.decodeByteArray(rawImage, 0, rawImage.length);
+		if (saveImage(bm, id)) {
+			Toast.makeText(getActivity(), getString(R.string.image_saved), Toast.LENGTH_SHORT).show();
+		} else {
+			Toast.makeText(getActivity(), getString(R.string.image_not_saved), Toast.LENGTH_LONG).show();
+		}
+	}
+	
+	private boolean saveImage(Bitmap bm, int id) {
 		try {
-			byte[] rawImage = LinphoneActivity.instance().getChatStorage().getRawImageFromMessage(id);
-			Bitmap bm = BitmapFactory.decodeByteArray(rawImage, 0, rawImage.length);
-			
 			String path = Environment.getExternalStorageDirectory().toString();
 			OutputStream fOut = null;
 			File file = new File(path, getString(R.string.picture_name_format).replace("%s", String.valueOf(id)));
@@ -739,13 +754,15 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			bm.compress(Bitmap.CompressFormat.JPEG, 100, fOut);
 			fOut.flush();
 			fOut.close();
+			
+			//TODO: Update url path in liblinphone database
 
-			Toast.makeText(getActivity(), getString(R.string.image_saved), Toast.LENGTH_SHORT).show();
 			MediaStore.Images.Media.insertImage(getActivity().getContentResolver(),file.getAbsolutePath(),file.getName(),file.getName());
+			return true;
 		} catch (Exception e) {
-			Toast.makeText(getActivity(), getString(R.string.image_not_saved), Toast.LENGTH_LONG).show();
 			e.printStackTrace();
 		}
+		return false;
 	}
 	
 	private long hashBitmap(Bitmap bmp){

src/org/linphone/ChatStorage.java

@@ -162,7 +162,7 @@ public class ChatStorage {
 	
 	public void saveImage(int id, Bitmap image) {
 		if (useNativeAPI) {
-			//TODO
+			//Handled before this point
 			return;
 		}
 		
@@ -409,7 +409,7 @@ public class ChatStorage {
 
 	public byte[] getRawImageFromMessage(int id) {
 		if (useNativeAPI) {
-			//TODO
+			//Handled before this point
 			return null;
 		}
 		

submodules/linphone

@@ -1 +1 @@
-Subproject commit 88a0da21c15c3ac031e55b40e219aebee85e82b0
+Subproject commit d56d927caf4c22554e333ff3227628da2d370a65