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

returning optionals for the optional god

Browse Source 
closes sk22#555
This commit is contained in:
sk
2023-06-08 15:31:58 +02:00
parent 1ab953d819
commit 97547f334f
2 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
View File

@@ -64,8 +64,8 @@ public class ExternalShareActivity extends FragmentStackActivity{
fediHandle fediHandle
.<MastodonAPIRequest<?>>map(handle -> .<MastodonAPIRequest<?>>map(handle ->
UiUtils.lookupAccountHandle(this, accountId, handle, callback)) UiUtils.lookupAccountHandle(this, accountId, handle, callback))
.or(() -> Optional.ofNullable( .or(() ->
UiUtils.lookupURL(this, accountId, text.get(), false, callback))) UiUtils.lookupURL(this, accountId, text.get(), false, callback))
.ifPresent(req -> .ifPresent(req ->
req.wrapProgress(this, R.string.loading, true, d -> { req.wrapProgress(this, R.string.loading, true, d -> {
UiUtils.transformDialogForLookup(this, accountId, isFediUrl ? text.get() : null, d); UiUtils.transformDialogForLookup(this, accountId, isFediUrl ? text.get() : null, d);

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

@@ -1053,43 +1053,43 @@ public class UiUtils {
}, null); }, null);
} }
public static void lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> resultConsumer) { public static Optional<MastodonAPIRequest<SearchResults>> lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> resultConsumer) {
lookup(context, queryStatus, targetAccountID, sourceAccountID, GetSearchResults.Type.STATUSES, resultConsumer, results -> return lookup(context, queryStatus, targetAccountID, sourceAccountID, GetSearchResults.Type.STATUSES, resultConsumer, results ->
!results.statuses.isEmpty() ? Optional.of(results.statuses.get(0)) : Optional.empty() !results.statuses.isEmpty() ? Optional.of(results.statuses.get(0)) : Optional.empty()
); );
} }
public static void lookupAccount(Context context, Account queryAccount, String targetAccountID, @Nullable String sourceAccountID, Consumer<Account> resultConsumer) { public static Optional<MastodonAPIRequest<SearchResults>> lookupAccount(Context context, Account queryAccount, String targetAccountID, @Nullable String sourceAccountID, Consumer<Account> resultConsumer) {
lookup(context, queryAccount, targetAccountID, sourceAccountID, GetSearchResults.Type.ACCOUNTS, resultConsumer, results -> return lookup(context, queryAccount, targetAccountID, sourceAccountID, GetSearchResults.Type.ACCOUNTS, resultConsumer, results ->
!results.accounts.isEmpty() ? Optional.of(results.accounts.get(0)) : Optional.empty() !results.accounts.isEmpty() ? Optional.of(results.accounts.get(0)) : Optional.empty()
); );
} }
public static <T extends Searchable> void lookup(Context context, T query, String targetAccountID, @Nullable String sourceAccountID, @Nullable GetSearchResults.Type type, Consumer<T> resultConsumer, Function<SearchResults, Optional<T>> extractResult) { public static <T extends Searchable> Optional<MastodonAPIRequest<SearchResults>> lookup(Context context, T query, String targetAccountID, @Nullable String sourceAccountID, @Nullable GetSearchResults.Type type, Consumer<T> resultConsumer, Function<SearchResults, Optional<T>> extractResult) {
if (sourceAccountID != null && targetAccountID.startsWith(sourceAccountID.substring(0, sourceAccountID.indexOf('_')))) { if (sourceAccountID != null && targetAccountID.startsWith(sourceAccountID.substring(0, sourceAccountID.indexOf('_')))) {
resultConsumer.accept(query); resultConsumer.accept(query);
return; return Optional.empty();
} }
new GetSearchResults(query.getQuery(), type, true).setCallback(new Callback<>() { return Optional.of(new GetSearchResults(query.getQuery(), type, true).setCallback(new Callback<>() {
@Override @Override
public void onSuccess(SearchResults results) { public void onSuccess(SearchResults results) {
Optional<T> result = extractResult.apply(results); Optional<T> result = extractResult.apply(results);
if (result.isPresent()) resultConsumer.accept(result.get()); if (result.isPresent()) resultConsumer.accept(result.get());
else { else {
Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show(); Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
resultConsumer.accept(null); resultConsumer.accept(null);
} }
} }
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error) {
error.showToast(context); error.showToast(context);
} }
}) })
.wrapProgress((Activity) context, R.string.loading, true, .wrapProgress((Activity) context, R.string.loading, true,
d -> transformDialogForLookup(context, targetAccountID, null, d)) d -> transformDialogForLookup(context, targetAccountID, null, d))
.exec(targetAccountID); .exec(targetAccountID));
} }
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) {
@@ -1129,13 +1129,13 @@ public class UiUtils {
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) { if (clazz == null) {
if (args.containsKey("error")) Toast.makeText(context, args.getString("error"), Toast.LENGTH_SHORT).show(); if (args != null && args.containsKey("error")) Toast.makeText(context, args.getString("error"), Toast.LENGTH_SHORT).show();
if (launchBrowser) launchWebBrowser(context, url); if (launchBrowser) launchWebBrowser(context, url);
return; return;
} }
Nav.go((Activity) context, clazz, args); Nav.go((Activity) context, clazz, args);
}).wrapProgress((Activity) context, R.string.loading, true, d -> }).map(req -> req.wrapProgress((Activity) context, R.string.loading, true, d ->
transformDialogForLookup(context, accountID, url, d)); transformDialogForLookup(context, accountID, url, d)));
} }
public static boolean acctMatches(String accountID, String acct, String queriedUsername, @Nullable String queriedDomain) { public static boolean acctMatches(String accountID, String acct, String queriedUsername, @Nullable String queriedDomain) {
@@ -1158,11 +1158,13 @@ public class UiUtils {
} }
} }
public static void lookupAccountHandle(Context context, String accountID, String query, BiConsumer<Class<? extends Fragment>, Bundle> go) { public static Optional<MastodonAPIRequest<SearchResults>> lookupAccountHandle(Context context, String accountID, String query, BiConsumer<Class<? extends Fragment>, Bundle> go) {
parseFediverseHandle(query).ifPresentOrElse( return parseFediverseHandle(query).map(
handle -> lookupAccountHandle(context, accountID, handle, go), handle -> lookupAccountHandle(context, accountID, handle, go))
() -> go.accept(null, null) .or(() -> {
); go.accept(null, null);
return Optional.empty();
});
} }
public static MastodonAPIRequest<SearchResults> lookupAccountHandle(Context context, String accountID, Pair<String, Optional<String>> queryHandle, BiConsumer<Class<? extends Fragment>, Bundle> go) { public static MastodonAPIRequest<SearchResults> lookupAccountHandle(Context context, String accountID, Pair<String, Optional<String>> queryHandle, BiConsumer<Class<? extends Fragment>, Bundle> go) {
String fullHandle = ("@" + queryHandle.first) + (queryHandle.second.map(domain -> "@" + domain).orElse("")); String fullHandle = ("@" + queryHandle.first) + (queryHandle.second.map(domain -> "@" + domain).orElse(""));
@@ -1190,12 +1192,12 @@ public class UiUtils {
}).exec(accountID); }).exec(accountID);
} }
public static MastodonAPIRequest<?> lookupURL(Context context, String accountID, String url, boolean launchBrowser, BiConsumer<Class<? extends Fragment>, Bundle> go) { public static Optional<MastodonAPIRequest<?>> lookupURL(Context context, String accountID, String url, boolean launchBrowser, BiConsumer<Class<? extends Fragment>, Bundle> go) {
Uri uri = Uri.parse(url); Uri uri = Uri.parse(url);
List<String> path = uri.getPathSegments(); List<String> path = uri.getPathSegments();
if (accountID != null && "https".equals(uri.getScheme())) { if (accountID != null && "https".equals(uri.getScheme())) {
if (path.size() == 2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$") && AccountSessionManager.getInstance().getAccount(accountID).domain.equalsIgnoreCase(uri.getAuthority())) { if (path.size() == 2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$") && AccountSessionManager.getInstance().getAccount(accountID).domain.equalsIgnoreCase(uri.getAuthority())) {
return new GetStatusByID(path.get(1)) return Optional.of(new GetStatusByID(path.get(1))
.setCallback(new Callback<>() { .setCallback(new Callback<>() {
@Override @Override
public void onSuccess(Status result) { public void onSuccess(Status result) {
@@ -1210,9 +1212,9 @@ public class UiUtils {
go.accept(null, bundleError(error)); go.accept(null, bundleError(error));
} }
}) })
.exec(accountID); .exec(accountID));
} else if (looksLikeFediverseUrl(url)) { } else if (looksLikeFediverseUrl(url)) {
return new GetSearchResults(url, null, true) return Optional.of(new GetSearchResults(url, null, true)
.setCallback(new Callback<>() { .setCallback(new Callback<>() {
@Override @Override
public void onSuccess(SearchResults results) { public void onSuccess(SearchResults results) {
@@ -1239,12 +1241,11 @@ public class UiUtils {
go.accept(null, bundleError(error)); go.accept(null, bundleError(error));
} }
}) })
.exec(accountID); .exec(accountID));
} }
} }
if (launchBrowser) launchWebBrowser(context, url);
go.accept(null, null); go.accept(null, null);
return null; return Optional.empty();
} }
public static void copyText(View v, String text) { public static void copyText(View v, String text) {