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

Merge branch 'main' into fork

Browse Source
This commit is contained in:
sk
2022-11-09 09:48:03 +01:00
parent 430d4ec93b ae50e618c0
commit aa48233a75
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/api/ResizedImageRequestBody.java
View File

@@ -12,6 +12,7 @@ import android.media.ExifInterface;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.text.TextUtils;
import org.joinmastodon.android.MastodonApp; import org.joinmastodon.android.MastodonApp;
import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.utils.UiUtils;
@@ -48,6 +49,8 @@ public class ResizedImageRequestBody extends CountingRequestBody{
} }
contentType=MastodonApp.context.getContentResolver().getType(uri); contentType=MastodonApp.context.getContentResolver().getType(uri);
} }
if(TextUtils.isEmpty(contentType))
contentType="image/jpeg";
if(needResize(opts.outWidth, opts.outHeight) || needCrop(opts.outWidth, opts.outHeight)){ if(needResize(opts.outWidth, opts.outHeight) || needCrop(opts.outWidth, opts.outHeight)){
Bitmap bitmap; Bitmap bitmap;
if(Build.VERSION.SDK_INT>=28){ if(Build.VERSION.SDK_INT>=28){

19
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@@ -422,17 +422,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
outState.putStringArrayList("pollOptions", opts); outState.putStringArrayList("pollOptions", opts);
outState.putInt("pollDuration", pollDuration); outState.putInt("pollDuration", pollDuration);
outState.putString("pollDurationStr", pollDurationStr); outState.putString("pollDurationStr", pollDurationStr);
outState.putBoolean("hasSpoiler", hasSpoiler);
if(!attachments.isEmpty()){
ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
for(DraftMediaAttachment att:attachments){
serializedAttachments.add(Parcels.wrap(att));
}
outState.putParcelableArrayList("attachments", serializedAttachments);
}
outState.putSerializable("visibility", statusVisibility);
} }
outState.putBoolean("hasSpoiler", hasSpoiler);
outState.putBoolean("sensitive", sensitive); outState.putBoolean("sensitive", sensitive);
if(!attachments.isEmpty()){
ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
for(DraftMediaAttachment att:attachments){
serializedAttachments.add(Parcels.wrap(att));
}
outState.putParcelableArrayList("attachments", serializedAttachments);
}
outState.putSerializable("visibility", statusVisibility);
} }
@Override @Override
@@ -557,6 +557,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
da.serverAttachment=att; da.serverAttachment=att;
da.description=att.description; da.description=att.description;
da.uri=Uri.parse(att.previewUrl); da.uri=Uri.parse(att.previewUrl);
da.state=AttachmentUploadState.DONE;
attachmentsView.addView(createMediaAttachmentView(da)); attachmentsView.addView(createMediaAttachmentView(da));
attachments.add(da); attachments.add(da);
} }

2
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
View File

@@ -91,6 +91,8 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
@Override @Override
public void onItemClick(String id){ public void onItemClick(String id){
SearchResult res=getResultByID(id); SearchResult res=getResultByID(id);
if(res==null)
return;
switch(res.type){ switch(res.type){
case ACCOUNT -> { case ACCOUNT -> {
Bundle args=new Bundle(); Bundle args=new Bundle();

12
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
View File

@@ -200,7 +200,6 @@ public class SignupFragment extends AppKitFragment{
@Override @Override
public void onSuccess(Token result){ public void onSuccess(Token result){
progressDialog.dismiss(); progressDialog.dismiss();
progressDialog=null;
Account fakeAccount=new Account(); Account fakeAccount=new Account();
fakeAccount.acct=fakeAccount.username=username; fakeAccount.acct=fakeAccount.username=username;
fakeAccount.id="tmp"+System.currentTimeMillis(); fakeAccount.id="tmp"+System.currentTimeMillis();
@@ -238,7 +237,6 @@ public class SignupFragment extends AppKitFragment{
error.showToast(getActivity()); error.showToast(getActivity());
} }
progressDialog.dismiss(); progressDialog.dismiss();
progressDialog=null;
} }
}) })
.exec(instance.uri, apiToken); .exec(instance.uri, apiToken);
@@ -255,9 +253,11 @@ public class SignupFragment extends AppKitFragment{
} }
private void showProgressDialog(){ private void showProgressDialog(){
progressDialog=new ProgressDialog(getActivity()); if(progressDialog==null){
progressDialog.setMessage(getString(R.string.loading)); progressDialog=new ProgressDialog(getActivity());
progressDialog.setCancelable(false); progressDialog.setMessage(getString(R.string.loading));
progressDialog.setCancelable(false);
}
progressDialog.show(); progressDialog.show();
} }
@@ -280,7 +280,6 @@ public class SignupFragment extends AppKitFragment{
if(submitAfterGettingToken){ if(submitAfterGettingToken){
submitAfterGettingToken=false; submitAfterGettingToken=false;
progressDialog.dismiss(); progressDialog.dismiss();
progressDialog=null;
error.showToast(getActivity()); error.showToast(getActivity());
} }
} }
@@ -307,7 +306,6 @@ public class SignupFragment extends AppKitFragment{
if(submitAfterGettingToken){ if(submitAfterGettingToken){
submitAfterGettingToken=false; submitAfterGettingToken=false;
progressDialog.dismiss(); progressDialog.dismiss();
progressDialog=null;
error.showToast(getActivity()); error.showToast(getActivity());
} }
} }