submenu for attach file
This commit is contained in:
parent
7e66731960
commit
6dfd885d34
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/attach_choose_picture"
|
||||||
|
android:title="@string/attach_choose_picture"/>
|
||||||
|
<item
|
||||||
|
android:id="@+id/attach_take_picture"
|
||||||
|
android:title="@string/attach_take_picture"/>
|
||||||
|
|
||||||
|
</menu>
|
|
@ -128,4 +128,6 @@
|
||||||
<string name="send_presence_updates">Send presence updates</string>
|
<string name="send_presence_updates">Send presence updates</string>
|
||||||
<string name="receive_presence_updates">Receive presence updates</string>
|
<string name="receive_presence_updates">Receive presence updates</string>
|
||||||
<string name="ask_for_presence_updates">Ask for presence updates</string>
|
<string name="ask_for_presence_updates">Ask for presence updates</string>
|
||||||
|
<string name="attach_choose_picture">Choose picture</string>
|
||||||
|
<string name="attach_take_picture">Take picture</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -19,6 +19,7 @@ import android.net.Uri;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
|
import android.provider.MediaStore;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.FragmentTransaction;
|
import android.app.FragmentTransaction;
|
||||||
import android.app.PendingIntent;
|
import android.app.PendingIntent;
|
||||||
|
@ -65,6 +66,7 @@ public class ConversationActivity extends XmppActivity {
|
||||||
public static final int REQUEST_SEND_MESSAGE = 0x75441;
|
public static final int REQUEST_SEND_MESSAGE = 0x75441;
|
||||||
public static final int REQUEST_DECRYPT_PGP = 0x76783;
|
public static final int REQUEST_DECRYPT_PGP = 0x76783;
|
||||||
private static final int REQUEST_ATTACH_FILE_DIALOG = 0x48502;
|
private static final int REQUEST_ATTACH_FILE_DIALOG = 0x48502;
|
||||||
|
private static final int REQUEST_IMAGE_CAPTURE = 0x33788;
|
||||||
private static final int REQUEST_SEND_PGP_IMAGE = 0x53883;
|
private static final int REQUEST_SEND_PGP_IMAGE = 0x53883;
|
||||||
private static final int REQUEST_ATTACH_FILE = 0x73824;
|
private static final int REQUEST_ATTACH_FILE = 0x73824;
|
||||||
public static final int REQUEST_ENCRYPT_MESSAGE = 0x378018;
|
public static final int REQUEST_ENCRYPT_MESSAGE = 0x378018;
|
||||||
|
@ -348,6 +350,14 @@ public class ConversationActivity extends XmppActivity {
|
||||||
},"file");
|
},"file");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void takePicture() {
|
||||||
|
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||||
|
if (takePictureIntent.resolveActivity(getPackageManager()) != null) {
|
||||||
|
startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void attachFile() {
|
private void attachFile() {
|
||||||
final Conversation conversation = getSelectedConversation();
|
final Conversation conversation = getSelectedConversation();
|
||||||
if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
|
if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
|
||||||
|
@ -423,7 +433,25 @@ public class ConversationActivity extends XmppActivity {
|
||||||
spl.openPane();
|
spl.openPane();
|
||||||
break;
|
break;
|
||||||
case R.id.action_attach_file:
|
case R.id.action_attach_file:
|
||||||
attachFile();
|
View menuAttachFile = findViewById(R.id.action_attach_file);
|
||||||
|
PopupMenu attachFilePopup = new PopupMenu(this, menuAttachFile);
|
||||||
|
attachFilePopup.inflate(R.menu.attachment_choices);
|
||||||
|
attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onMenuItemClick(MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case R.id.attach_choose_picture:
|
||||||
|
attachFile();
|
||||||
|
break;
|
||||||
|
case R.id.attach_take_picture:
|
||||||
|
takePicture();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
attachFilePopup.show();
|
||||||
break;
|
break;
|
||||||
case R.id.action_add:
|
case R.id.action_add:
|
||||||
startActivity(new Intent(this, ContactsActivity.class));
|
startActivity(new Intent(this, ContactsActivity.class));
|
||||||
|
|
Loading…
Reference in New Issue