Skip to content

Commit 2314a94

Browse files
Set "Search In" after opening SearchActivity from ViewMultiRedditDetailActivity.
1 parent d270378 commit 2314a94

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewMultiRedditDetailActivity.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import ml.docilealligator.infinityforreddit.R;
4242
import ml.docilealligator.infinityforreddit.RecyclerViewContentScrollingInterface;
4343
import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
44+
import ml.docilealligator.infinityforreddit.SelectThingReturnKey;
4445
import ml.docilealligator.infinityforreddit.SortType;
4546
import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
4647
import ml.docilealligator.infinityforreddit.account.Account;
@@ -116,6 +117,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
116117
CustomThemeWrapper mCustomThemeWrapper;
117118
@Inject
118119
Executor mExecutor;
120+
private MultiReddit multiReddit;
119121
private String multiPath;
120122
private Fragment mFragment;
121123
private int fabOption;
@@ -185,7 +187,7 @@ protected void onCreate(Bundle savedInstanceState) {
185187
}
186188
}
187189

188-
MultiReddit multiReddit = getIntent().getParcelableExtra(EXTRA_MULTIREDDIT_DATA);
190+
multiReddit = getIntent().getParcelableExtra(EXTRA_MULTIREDDIT_DATA);
189191
if (multiReddit == null) {
190192
multiPath = getIntent().getStringExtra(EXTRA_MULTIREDDIT_PATH);
191193
if (multiPath != null) {
@@ -730,6 +732,16 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
730732
return true;
731733
} else if (itemId == R.id.action_search_view_multi_reddit_detail_activity) {
732734
Intent intent = new Intent(this, SearchActivity.class);
735+
if (multiReddit == null) {
736+
MultiReddit dummyMultiReddit = new MultiReddit(multiPath,
737+
multiPath.substring(multiPath.lastIndexOf("/", multiPath.length() - 2) + 1),
738+
multiPath, null, null, null, null, Account.ANONYMOUS_ACCOUNT,
739+
0, 0, true, false, false);
740+
intent.putExtra(SearchActivity.EXTRA_SEARCH_IN_MULTIREDDIT, dummyMultiReddit);
741+
} else {
742+
intent.putExtra(SearchActivity.EXTRA_SEARCH_IN_MULTIREDDIT, multiReddit);
743+
}
744+
intent.putExtra(SearchActivity.EXTRA_SEARCH_IN_THING_TYPE, SelectThingReturnKey.THING_TYPE.MULTIREDDIT);
733745
startActivity(intent);
734746
return true;
735747
} else if (itemId == R.id.action_refresh_view_multi_reddit_detail_activity) {

0 commit comments

Comments
 (0)