Voice recording

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/org/kontalk/ui/CircularSeekBar.java=UTF-8

app/build.gradle

@@ -16,7 +16,7 @@ task checkstyle(type: Checkstyle){
         'googleplay/java/org/kontalk/billing/ProductDetails.java',
         'googleplay/java/org/kontalk/billing/Purchase.java'
     // 3rd-party code
-    exclude '**/IconContextMenu.java',
+    exclude '**/IconContextMenu.java', '**/CircularSeekBar.java',
         '**/KeyboardAwareFrameLayout.java'
     classpath = files()
 }
@@ -66,6 +66,8 @@ dependencies {
     compile 'com.madgag.spongycastle:pg:1.51.0.0'
     compile 'com.googlecode.libphonenumber:libphonenumber:6.2.2'
     compile 'dnsjava:dnsjava:2.1.6'
+    compile 'com.jcraft:jzlib:+'
+    compile 'com.nineoldandroids:library:2.4.0+'
     compile 'com.jcraft:jzlib:1.1.3'
     compile 'org.igniterealtime.smack:smack-android:4.1.0-alpha5'
     compile 'org.igniterealtime.smack:smack-core:4.1.0-alpha5'

app/src/main/AndroidManifest.xml

@@ -39,6 +39,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <!-- do not make telephony and touchscreen mandatory -->
     <uses-feature android:name="android.hardware.telephony" android:required="false"/>

app/src/main/java/org/kontalk/message/AudioComponent.java

@@ -0,0 +1,83 @@
+/*
+ * Kontalk Android client
+ * Copyright (C) 2014 Kontalk Devteam <devteam@kontalk.org>
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.kontalk.message;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+
+import org.kontalk.util.MediaStorage;
+
+/**
+ * Audio component.
+ * @author Andrea Cappelli
+ */
+
+public class AudioComponent extends AttachmentComponent {
+
+    static Map<String, String> MIME_TYPES = new HashMap<String, String>();
+    static {
+        MIME_TYPES.put("audio/3gpp", "3gp");
+        MIME_TYPES.put("audio/mpeg", "mp3");
+        MIME_TYPES.put("audio/mp4", "mp4");
+        MIME_TYPES.put("audio/wav", "wav");
+        MIME_TYPES.put("audio/aac", "aac");
+        MIME_TYPES.put("audio/flac", "flac");
+    }
+
+    public AudioComponent(String mime, Uri localUri, String fetchUrl, long length, boolean encrypted, int securityFlags) {
+        super(mime, null, localUri, fetchUrl, length, encrypted, securityFlags);
+    }
+
+    public static boolean supportsMimeType(String mime) {
+        return MIME_TYPES.containsKey(mime);
+    }
+
+    /** FIXME not used yet */
+    public boolean isValidMedia(Context context) {
+        Uri localUri = mContent.getLocalUri();
+        if (localUri != null) {
+            try {
+                return (MediaStorage.getLength(context, localUri) == mLength);
+            }
+            catch (Exception e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void populateFromCursor(Context context, Cursor c) {
+        // Nothing to do here
+    }
+
+    public static String buildMediaFilename(String id, String mime) {
+        return "audio" + id.substring(id.length() - 5) + "." + getFileExtension(mime);
+    }
+
+    /** Returns the file extension from the mime type. */
+    public static String getFileExtension(String mime) {
+        return MIME_TYPES.get(mime);
+    }
+}

app/src/main/java/org/kontalk/message/CompositeMessage.java

@@ -50,6 +50,7 @@ public class CompositeMessage {
     @SuppressWarnings("unchecked")
     private static final Class<AttachmentComponent>[] TRY_COMPONENTS = new Class[] {
         ImageComponent.class,
+        AudioComponent.class,
         VCardComponent.class,
     };
 
@@ -130,7 +131,7 @@ public class CompositeMessage {
 
     /** Creates a new composite message. */
     public CompositeMessage(Context context, String id, long timestamp, String sender, boolean encrypted, int securityFlags) {
-        this();
+    	this();
 
         mContext = context;
 
@@ -147,7 +148,7 @@ public CompositeMessage(Context context, String id, long timestamp, String sende
 
     /** Empty constructor for local use. */
     private CompositeMessage() {
-        mComponents = new ArrayList<MessageComponent<?>>();
+    	mComponents = new ArrayList<MessageComponent<?>>();
     }
 
     public String getId() {
@@ -201,7 +202,7 @@ public int getStatus() {
 
     @Override
     public String toString() {
-        // FIXME include components
+    	// FIXME include components
         return getClass().getSimpleName() + ": id=" + mId;
     }
 
@@ -235,11 +236,11 @@ public void setSecurityFlags(int flags) {
     }
 
     public void addComponent(MessageComponent<?> c) {
-        mComponents.add(c);
+    	mComponents.add(c);
     }
 
     public void clearComponents() {
-        mComponents.clear();
+    	mComponents.clear();
     }
 
     /** Returns the first component of the given type. */
@@ -253,7 +254,7 @@ public MessageComponent<?> getComponent(Class<? extends MessageComponent<?>> typ
     }
 
     public List<MessageComponent<?>> getComponents() {
-        return mComponents;
+    	return mComponents;
     }
 
     private void populateFromCursor(Cursor c) {
@@ -284,65 +285,70 @@ private void populateFromCursor(Cursor c) {
 
         // encrypted message - single raw encrypted component
         if (mEncrypted) {
-            RawComponent raw = new RawComponent(body, true, mSecurityFlags);
-            addComponent(raw);
+        	RawComponent raw = new RawComponent(body, true, mSecurityFlags);
+        	addComponent(raw);
         }
 
         else {
 
-            String mime = c.getString(COLUMN_BODY_MIME);
-
-            if (body != null) {
-
-                // text data
-                if (TextComponent.supportsMimeType(mime)) {
-                    TextComponent txt = new TextComponent(new String(body));
-                    addComponent(txt);
+	        String mime = c.getString(COLUMN_BODY_MIME);
+
+	        if (body != null) {
+
+		        // text data
+		        if (TextComponent.supportsMimeType(mime)) {
+		        	TextComponent txt = new TextComponent(new String(body));
+		        	addComponent(txt);
+		        }
+
+		        // unknown data
+		        else {
+		        	RawComponent raw = new RawComponent(body, false, mSecurityFlags);
+		        	addComponent(raw);
+		        }
+	        }
+
+	        // attachment
+	        String attMime = c.getString(COLUMN_ATTACHMENT_MIME);
+	        if (attMime != null) {
+
+	        	String attPreview = c.getString(COLUMN_ATTACHMENT_PREVIEW_PATH);
+	        	String attLocal = c.getString(COLUMN_ATTACHMENT_LOCAL_URI);
+	        	String attFetch = c.getString(COLUMN_ATTACHMENT_FETCH_URL);
+	        	long attLength = c.getLong(COLUMN_ATTACHMENT_LENGTH);
+	        	boolean attEncrypted = c.getInt(COLUMN_ATTACHMENT_ENCRYPTED) > 0;
+	        	int attSecurityFlags = c.getInt(COLUMN_ATTACHMENT_SECURITY_FLAGS);
+
+	        	AttachmentComponent att = null;
+        		File previewFile = (attPreview != null) ? new File(attPreview) : null;
+        		Uri localUri = (attLocal != null) ? Uri.parse(attLocal) : null;
+
+	        	if (ImageComponent.supportsMimeType(attMime)) {
+	        		att = new ImageComponent(attMime, previewFile,
+	        				localUri, attFetch, attLength,
+	        				attEncrypted, attSecurityFlags);
+	        	}
+
+	        	else if (VCardComponent.supportsMimeType(attMime)) {
+	        		att = new VCardComponent(previewFile,
+	        				localUri, attFetch, attLength,
+	        				attEncrypted, attSecurityFlags);
+	        	}
+
+                else if (AudioComponent.supportsMimeType(attMime)) {
+                    att = new AudioComponent(attMime,
+                            localUri, attFetch,
+                            attLength, attEncrypted, attSecurityFlags);
                 }
 
-                // unknown data
-                else {
-                    RawComponent raw = new RawComponent(body, false, mSecurityFlags);
-                    addComponent(raw);
-                }
-            }
-
-            // attachment
-            String attMime = c.getString(COLUMN_ATTACHMENT_MIME);
-            if (attMime != null) {
-
-                String attPreview = c.getString(COLUMN_ATTACHMENT_PREVIEW_PATH);
-                String attLocal = c.getString(COLUMN_ATTACHMENT_LOCAL_URI);
-                String attFetch = c.getString(COLUMN_ATTACHMENT_FETCH_URL);
-                long attLength = c.getLong(COLUMN_ATTACHMENT_LENGTH);
-                boolean attEncrypted = c.getInt(COLUMN_ATTACHMENT_ENCRYPTED) > 0;
-                int attSecurityFlags = c.getInt(COLUMN_ATTACHMENT_SECURITY_FLAGS);
-
-                AttachmentComponent att = null;
-                File previewFile = (attPreview != null) ? new File(attPreview) : null;
-                Uri localUri = (attLocal != null) ? Uri.parse(attLocal) : null;
-
-                if (ImageComponent.supportsMimeType(attMime)) {
-                    att = new ImageComponent(attMime, previewFile,
-                            localUri, attFetch, attLength,
-                            attEncrypted, attSecurityFlags);
-                    att.populateFromCursor(mContext, c);
-                }
+	        	// TODO other type of attachments
 
-                else if (VCardComponent.supportsMimeType(attMime)) {
-                    att = new VCardComponent(previewFile,
-                            localUri, attFetch, attLength,
-                            attEncrypted, attSecurityFlags);
+	        	if (att != null) {
                     att.populateFromCursor(mContext, c);
-                }
-
-                // TODO other type of attachments
-
-
-                if (att != null)
                     addComponent(att);
+                }
 
-            }
+	        }
 
         }
     }
@@ -364,9 +370,9 @@ protected void clear() {
 
     /** Builds an instance from a {@link Cursor} row. */
     public static CompositeMessage fromCursor(Context context, Cursor cursor) {
-        CompositeMessage msg = new CompositeMessage();
-        msg.populateFromCursor(cursor);
-        // TODO
+    	CompositeMessage msg = new CompositeMessage();
+    	msg.populateFromCursor(cursor);
+    	// TODO
         return msg;
     }
 
@@ -380,27 +386,27 @@ public static void startQuery(AsyncQueryHandler handler, int token, long threadI
 
     /** A sample text content from class name and mime type. */
     public static String getSampleTextContent(String mime) {
-        // TODO i18n
-        // FIXME using reflection BAD BAD BAD !!!
-        for (Class<AttachmentComponent> klass : TRY_COMPONENTS) {
-            Boolean supported = null;
-            try {
-                Method m = klass.getMethod("supportsMimeType", new Class[] { String.class });
-                supported = (Boolean) m.invoke(klass, mime);
-            }
-            catch (Exception e) {
-                // ignored
-            }
-
-            if (supported != null && supported.booleanValue()) {
-                String cname = klass.getSimpleName();
-                return cname.substring(0, cname.length() - SUFFIX_LENGTH) +
-                    ": " + mime;
-            }
-        }
-
-        // no supporting component - return mime
-        return "Unknown: " + mime;
+    	// TODO i18n
+    	// FIXME using reflection BAD BAD BAD !!!
+    	for (Class<AttachmentComponent> klass : TRY_COMPONENTS) {
+    		Boolean supported = null;
+    		try {
+				Method m = klass.getMethod("supportsMimeType", new Class[] { String.class });
+				supported = (Boolean) m.invoke(klass, mime);
+			}
+    		catch (Exception e) {
+    			// ignored
+			}
+
+    		if (supported != null && supported.booleanValue()) {
+		        String cname = klass.getSimpleName();
+		        return cname.substring(0, cname.length() - SUFFIX_LENGTH) +
+		            ": " + mime;
+    		}
+    	}
+
+    	// no supporting component - return mime
+    	return "Unknown: " + mime;
     }
 
     /** Still unused.

app/src/main/java/org/kontalk/service/msgcenter/MessageListener.java

@@ -42,6 +42,7 @@
 import org.kontalk.client.ServerReceipt;
 import org.kontalk.client.ServerReceiptRequest;
 import org.kontalk.crypto.Coder;
+import org.kontalk.message.AudioComponent;
 import org.kontalk.message.CompositeMessage;
 import org.kontalk.message.ImageComponent;
 import org.kontalk.message.MessageComponent;
@@ -266,6 +267,8 @@ else if (ext instanceof AckServerReceipt) {
 
                 }
 
+                // TODO duplicated code (MessageUtils#decryptMessage)
+
                 // out of band data
                 PacketExtension _media = m.getExtension(OutOfBandData.ELEMENT_NAME, OutOfBandData.NAMESPACE);
                 if (_media != null && _media instanceof OutOfBandData) {
@@ -319,6 +322,11 @@ else if (VCardComponent.supportsMimeType(mime)) {
                             encrypted, encrypted ? Coder.SECURITY_BASIC : Coder.SECURITY_CLEARTEXT);
                     }
 
+                    else if (AudioComponent.supportsMimeType(mime)) {
+                        attachment = new AudioComponent(mime, null, fetchUrl, length,
+                            encrypted, encrypted ? Coder.SECURITY_BASIC : Coder.SECURITY_CLEARTEXT);
+                    }
+
                     // TODO other types
 
                     if (attachment != null)