From eb822282c023630fa8625049a55ec05279b9342a Mon Sep 17 00:00:00 2001 From: Grishka Date: Fri, 30 Jun 2023 09:18:48 +0300 Subject: [PATCH] Minor fixes --- .../android/test/StoreScreenshotsGenerator.java | 9 +++++---- .../android/fragments/discover/SearchFragment.java | 2 ++ .../ui/viewcontrollers/ComposeMediaViewController.java | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java index d895e4cc..301771b7 100644 --- a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java +++ b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java @@ -65,6 +65,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.*; @LargeTest public class StoreScreenshotsGenerator{ private static final String PHOTO_FILE="IMG_1010.jpg"; + private static final long LOAD_WAIT_TIMEOUT=20_000; @Rule public ActivityScenarioRule activityScenarioRule=new ActivityScenarioRule<>(MainActivity.class); @@ -84,14 +85,14 @@ public class StoreScreenshotsGenerator{ AccountSession session=AccountSessionManager.getInstance().getAccount(AccountSessionManager.getInstance().getLastActiveAccountID()); MastodonApp.context.deleteDatabase(session.getID()+".db"); - onView(isRoot()).perform(waitId(R.id.more, 5000)); + onView(isRoot()).perform(waitId(R.id.more, LOAD_WAIT_TIMEOUT)); Thread.sleep(500); takeScreenshot("HomeTimeline"); GlobalUserPreferences.theme=GlobalUserPreferences.ThemePreference.DARK; activityScenarioRule.getScenario().recreate(); - onView(isRoot()).perform(waitId(R.id.more, 5000)); + onView(isRoot()).perform(waitId(R.id.more, LOAD_WAIT_TIMEOUT)); Thread.sleep(500); takeScreenshot("HomeTimeline_Dark"); @@ -100,8 +101,8 @@ public class StoreScreenshotsGenerator{ activityScenarioRule.getScenario().onActivity(activity->UiUtils.openProfileByID(activity, session.getID(), args.getString("profileAccountID"))); Thread.sleep(500); - onView(isRoot()).perform(waitId(R.id.avatar_border, 5000)); // wait for profile to load - onView(isRoot()).perform(waitId(R.id.more, 5000)); // wait for timeline to load + onView(isRoot()).perform(waitId(R.id.avatar_border, LOAD_WAIT_TIMEOUT)); // wait for profile to load + onView(isRoot()).perform(waitId(R.id.more, LOAD_WAIT_TIMEOUT)); // wait for timeline to load Thread.sleep(500); takeScreenshot("Profile"); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index 41294e32..a317c6c4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java @@ -121,6 +121,8 @@ public class SearchFragment extends BaseStatusListFragment{ }else{ type=null; } + if(currentQuery==null) + return; currentRequest=new GetSearchResults(currentQuery, type, true) .setCallback(new Callback<>(){ @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java index 32f14a33..1e9dfc30 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java @@ -288,10 +288,13 @@ public class ComposeMediaViewController{ draft.uri=uri; draft.description=description; draft.mimeType="image/jpeg"; + draft.fileSize=2473276; + draft.state=AttachmentUploadState.PROCESSING; attachmentsView.addView(createMediaAttachmentView(draft)); attachments.add(draft); attachmentsScroller.setVisibility(View.VISIBLE); updateMediaAttachmentsLayout(); + finishMediaAttachmentUpload(draft); } private void uploadMediaAttachment(DraftMediaAttachment attachment){