Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #313

This commit is contained in:
Grishka 2022-11-26 18:40:17 +03:00
parent 9facdb938d
commit bb12a66781
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mastodon/src/main/java/org/joinmastodon/android/ui/views/ComposeEditText.java
View File

@ -8,7 +8,6 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.DragEvent; import android.view.DragEvent;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputConnection;
@ -22,7 +21,6 @@ import androidx.annotation.RequiresApi;
public class ComposeEditText extends EditText{ public class ComposeEditText extends EditText{
private SelectionListener selectionListener; private SelectionListener selectionListener;
private MediaAcceptingInputConnection inputConnectionWrapper=new MediaAcceptingInputConnection();
public ComposeEditText(Context context){ public ComposeEditText(Context context){
super(context); super(context);
@ -54,11 +52,10 @@ public class ComposeEditText extends EditText{
// Support receiving images from keyboards // Support receiving images from keyboards
@Override @Override
public InputConnection onCreateInputConnection(EditorInfo outAttrs){ public InputConnection onCreateInputConnection(EditorInfo outAttrs){
final var ic = super.onCreateInputConnection(outAttrs); final InputConnection ic=super.onCreateInputConnection(outAttrs);
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N_MR1){ if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N_MR1){
outAttrs.contentMimeTypes=selectionListener.onGetAllowedMediaMimeTypes(); outAttrs.contentMimeTypes=selectionListener.onGetAllowedMediaMimeTypes();
inputConnectionWrapper.setTarget(ic); return new MediaAcceptingInputConnection(ic);
return inputConnectionWrapper;
} }
return ic; return ic;
} }
@ -106,8 +103,8 @@ public class ComposeEditText extends EditText{
} }
private class MediaAcceptingInputConnection extends InputConnectionWrapper{ private class MediaAcceptingInputConnection extends InputConnectionWrapper{
public MediaAcceptingInputConnection(){ public MediaAcceptingInputConnection(InputConnection conn){
super(null, true); super(conn, false);
} }
@RequiresApi(api=Build.VERSION_CODES.N_MR1) @RequiresApi(api=Build.VERSION_CODES.N_MR1)