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

Crash fixes

This commit is contained in:
Grishka 2022-11-08 09:36:56 +03:00
parent 1ac6a04a46
commit 159d91f390
3 changed files with 10 additions and 7 deletions
Show Stats 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){

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();

6
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(){
if(progressDialog==null){
progressDialog=new ProgressDialog(getActivity()); progressDialog=new ProgressDialog(getActivity());
progressDialog.setMessage(getString(R.string.loading)); progressDialog.setMessage(getString(R.string.loading));
progressDialog.setCancelable(false); 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());
} }
} }