Skip to content
This repository was archived by the owner on May 30, 2025. It is now read-only.

Commit 159d91f

Browse files
committed
Crash fixes
1 parent 1ac6a04 commit 159d91f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

mastodon/src/main/java/org/joinmastodon/android/api/ResizedImageRequestBody.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.net.Uri;
1313
import android.os.Build;
1414
import android.provider.OpenableColumns;
15+
import android.text.TextUtils;
1516

1617
import org.joinmastodon.android.MastodonApp;
1718
import org.joinmastodon.android.ui.utils.UiUtils;
@@ -48,6 +49,8 @@ public ResizedImageRequestBody(Uri uri, int maxSize, ProgressListener progressLi
4849
}
4950
contentType=MastodonApp.context.getContentResolver().getType(uri);
5051
}
52+
if(TextUtils.isEmpty(contentType))
53+
contentType="image/jpeg";
5154
if(needResize(opts.outWidth, opts.outHeight) || needCrop(opts.outWidth, opts.outHeight)){
5255
Bitmap bitmap;
5356
if(Build.VERSION.SDK_INT>=28){

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ protected void addAccountToKnown(SearchResult s){
9191
@Override
9292
public void onItemClick(String id){
9393
SearchResult res=getResultByID(id);
94+
if(res==null)
95+
return;
9496
switch(res.type){
9597
case ACCOUNT -> {
9698
Bundle args=new Bundle();

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ private void actuallySubmit(){
200200
@Override
201201
public void onSuccess(Token result){
202202
progressDialog.dismiss();
203-
progressDialog=null;
204203
Account fakeAccount=new Account();
205204
fakeAccount.acct=fakeAccount.username=username;
206205
fakeAccount.id="tmp"+System.currentTimeMillis();
@@ -238,7 +237,6 @@ public void onError(ErrorResponse error){
238237
error.showToast(getActivity());
239238
}
240239
progressDialog.dismiss();
241-
progressDialog=null;
242240
}
243241
})
244242
.exec(instance.uri, apiToken);
@@ -255,9 +253,11 @@ private EditText getFieldByName(String name){
255253
}
256254

257255
private void showProgressDialog(){
258-
progressDialog=new ProgressDialog(getActivity());
259-
progressDialog.setMessage(getString(R.string.loading));
260-
progressDialog.setCancelable(false);
256+
if(progressDialog==null){
257+
progressDialog=new ProgressDialog(getActivity());
258+
progressDialog.setMessage(getString(R.string.loading));
259+
progressDialog.setCancelable(false);
260+
}
261261
progressDialog.show();
262262
}
263263

@@ -280,7 +280,6 @@ public void onError(ErrorResponse error){
280280
if(submitAfterGettingToken){
281281
submitAfterGettingToken=false;
282282
progressDialog.dismiss();
283-
progressDialog=null;
284283
error.showToast(getActivity());
285284
}
286285
}
@@ -307,7 +306,6 @@ public void onError(ErrorResponse error){
307306
if(submitAfterGettingToken){
308307
submitAfterGettingToken=false;
309308
progressDialog.dismiss();
310-
progressDialog=null;
311309
error.showToast(getActivity());
312310
}
313311
}

0 commit comments

Comments
 (0)