blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable direct cap 

Closes #3612
// FREEBIE
master
Jake McGinty 2015-07-10 18:45:55 -07:00 committed by Moxie Marlinspike
parent 7593918006
commit a44a4bc759
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/conversation_activity.xml
View File

@ -108,7 +108,8 @@
android:src="?quick_camera_icon"
android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
android:padding="10dp"/>
android:visibility="gone"
android:padding="10dp" />
</LinearLayout>
<org.thoughtcrime.securesms.components.AnimatingToggle

11
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -160,6 +160,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private static final int PICK_AUDIO = 3;
private static final int PICK_CONTACT_INFO = 4;
private static final int GROUP_EDIT = 5;
private static final int TAKE_PHOTO = 6;
private MasterSecret masterSecret;
protected ComposeText composeText;
@ -285,7 +286,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Log.w(TAG, "onActivityResult called: " + reqCode + ", " + resultCode + " , " + data);
super.onActivityResult(reqCode, resultCode, data);
if (data == null || resultCode != RESULT_OK) return;
if (data == null && reqCode != TAKE_PHOTO || resultCode != RESULT_OK) return;
switch (reqCode) {
case PICK_IMAGE:
@ -306,6 +307,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
setBlockedUserState(recipients);
supportInvalidateOptionsMenu();
break;
case TAKE_PHOTO:
if (attachmentManager.getCaptureUri() != null) {
addAttachmentImage(masterSecret, attachmentManager.getCaptureUri());
}
break;
}
}
@ -808,6 +814,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
ComposeKeyPressedListener composeKeyPressedListener = new ComposeKeyPressedListener();
attachButton.setOnClickListener(new AttachButtonListener());
quickAttachmentToggle.setEnabled(false);
sendButton.setOnClickListener(sendButtonListener);
sendButton.setEnabled(true);
sendButton.addOnTransportChangedListener(new OnTransportChangedListener() {
@ -963,6 +970,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
AttachmentManager.selectAudio(this, PICK_AUDIO); break;
case AttachmentTypeSelectorAdapter.ADD_CONTACT_INFO:
AttachmentManager.selectContactInfo(this, PICK_CONTACT_INFO); break;
case AttachmentTypeSelectorAdapter.TAKE_PHOTO:
attachmentManager.capturePhoto(this, TAKE_PHOTO); break;
}
}

23
src/org/thoughtcrime/securesms/mms/AttachmentManager.java
View File

@ -24,6 +24,7 @@ import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
import android.provider.ContactsContract;
import android.provider.MediaStore;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.View;
@ -41,6 +42,7 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.providers.CaptureProvider;
import org.thoughtcrime.securesms.util.BitmapDecodingException;
import java.io.File;
import java.io.IOException;
public class AttachmentManager {
@ -92,7 +94,8 @@ public class AttachmentManager {
}
public void cleanup() {
if (captureUri != null) CaptureProvider.getInstance(context).delete(captureUri);
// if (captureUri != null) CaptureProvider.getInstance(context).delete(captureUri);
if (captureUri != null) new File(captureUri.getPath()).delete();
captureUri = null;
}
@ -154,6 +157,24 @@ public class AttachmentManager {
activity.startActivityForResult(intent, requestCode);
}
public Uri getCaptureUri() {
return captureUri;
}
public void capturePhoto(Activity activity, int requestCode) {
try {
Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
File captureFile = File.createTempFile(String.valueOf(System.currentTimeMillis()), ".jpg", activity.getExternalFilesDir(null));
captureUri = Uri.fromFile(captureFile);
captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, captureUri);
activity.startActivityForResult(captureIntent, requestCode);
}
} catch (IOException ioe) {
Log.w(TAG, ioe);
}
}
private static void selectMediaType(Activity activity, String type, int requestCode) {
final Intent intent = new Intent();
intent.setType(type);

2
src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
View File

@ -37,6 +37,7 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter<AttachmentTypeSe
public static final int ADD_VIDEO = 2;
public static final int ADD_SOUND = 3;
public static final int ADD_CONTACT_INFO = 4;
public static final int TAKE_PHOTO = 5;
private final Context context;
@ -71,6 +72,7 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter<AttachmentTypeSe
private static List<IconListItem> getItemList(Context context) {
List<IconListItem> data = new ArrayList<>(4);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_take_photo), ResUtil.getDrawableRes(context, R.attr.conversation_attach_contact_info), TAKE_PHOTO);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), ResUtil.getDrawableRes(context, R.attr.conversation_attach_image), ADD_IMAGE);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video), ResUtil.getDrawableRes(context, R.attr.conversation_attach_video), ADD_VIDEO);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio), ResUtil.getDrawableRes(context, R.attr.conversation_attach_sound), ADD_SOUND);