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

generalize lookup error handling

Browse Source
This commit is contained in:
sk
2023-06-07 15:45:22 +02:00
parent 0091ae87ce
commit f31205c670
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -1092,10 +1092,6 @@ public class UiUtils {
.exec(targetAccountID); .exec(targetAccountID);
} }
public static void openURL(Context context, String accountID, String url) {
openURL(context, accountID, url, true);
}
public static void transformDialogForLookup(Context context, String accountID, @Nullable String url, ProgressDialog dialog) { public static void transformDialogForLookup(Context context, String accountID, @Nullable String url, ProgressDialog dialog) {
if (accountID != null) { if (accountID != null) {
dialog.setTitle(context.getString(R.string.sk_loading_resource_on_instance_title, getInstanceName(accountID))); dialog.setTitle(context.getString(R.string.sk_loading_resource_on_instance_title, getInstanceName(accountID)));
@@ -1111,9 +1107,32 @@ public class UiUtils {
} }
} }
private static Bundle bundleError(String error) {
Bundle args = new Bundle();
args.putString("error", error);
return args;
}
private static Bundle bundleError(ErrorResponse error) {
Bundle args = new Bundle();
if (error instanceof MastodonErrorResponse e) {
args.putString("error", e.error);
args.putInt("httpStatus", e.httpStatus);
}
return args;
}
public static void openURL(Context context, String accountID, String url) {
openURL(context, accountID, url, true);
}
public static void openURL(Context context, String accountID, String url, boolean launchBrowser) { public static void openURL(Context context, String accountID, String url, boolean launchBrowser) {
lookupURL(context, accountID, url, launchBrowser, (clazz, args) -> { lookupURL(context, accountID, url, launchBrowser, (clazz, args) -> {
if (clazz == null) return; if (clazz == null) {
if (args.containsKey("error")) Toast.makeText(context, args.getString("error"), Toast.LENGTH_SHORT).show();
if (launchBrowser) launchWebBrowser(context, url);
return;
}
Nav.go((Activity) context, clazz, args); Nav.go((Activity) context, clazz, args);
}).wrapProgress((Activity) context, R.string.loading, true, d -> }).wrapProgress((Activity) context, R.string.loading, true, d ->
transformDialogForLookup(context, accountID, url, d)); transformDialogForLookup(context, accountID, url, d));
@@ -1161,19 +1180,12 @@ public class UiUtils {
go.accept(ProfileFragment.class, args); go.accept(ProfileFragment.class, args);
return; return;
} }
Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show(); go.accept(null, bundleError(context.getString(R.string.sk_resource_not_found)));
args.putString("error", context.getString(R.string.sk_resource_not_found));
go.accept(null, null);
} }
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error) {
Bundle args = new Bundle(); go.accept(null, bundleError(error));
if (error instanceof MastodonErrorResponse e) {
args.putString("error", e.error);
args.putInt("httpStatus", e.httpStatus);
}
go.accept(null, args);
} }
}).exec(accountID); }).exec(accountID);
} }
@@ -1195,9 +1207,7 @@ public class UiUtils {
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error) {
error.showToast(context); go.accept(null, bundleError(error));
if (launchBrowser) launchWebBrowser(context, url);
go.accept(null, null);
} }
}) })
.exec(accountID); .exec(accountID);
@@ -1221,15 +1231,12 @@ public class UiUtils {
return; return;
} }
if (launchBrowser) launchWebBrowser(context, url); if (launchBrowser) launchWebBrowser(context, url);
Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show(); go.accept(null, bundleError(context.getString(R.string.sk_resource_not_found)));
go.accept(null, null);
} }
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error) {
error.showToast(context); go.accept(null, bundleError(error));
if (launchBrowser) launchWebBrowser(context, url);
go.accept(null, null);
} }
}) })
.exec(accountID); .exec(accountID);