Compare commits

...

3 Commits

Author SHA1 Message Date
Balazs Toldi
b69245aedc
Fix shortcut login issues
Fix issues with home screen shortcuts not logging the user in properly
2024-01-04 19:12:18 +01:00
Balazs Toldi
3dc94a05c7
Remove report option from User pages
This was a reddit feature that is unavailable on Lemmy. Closes #211
2024-01-04 15:02:27 +01:00
Balazs Toldi
d0849e9f27
Fix pull down refresh on Post detail pages
The refresh function was incorrectly called, making the loading progress not stopping at all (actually it didn't even start properly)
2024-01-04 14:51:54 +01:00
4 changed files with 9 additions and 11 deletions

View File

@ -392,6 +392,14 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null); mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null); mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
if (mAccessToken != null) {
mRetrofit.setAccessToken(mAccessToken);
}
String instance = (mAccessToken == null) ? mSharedPreferences.getString(SharedPreferencesUtils.ANONYMOUS_ACCOUNT_INSTANCE, APIUtils.API_BASE_URI) : mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
if (instance != null) {
mRetrofit.setBaseURL(instance);
}
if (savedInstanceState == null) { if (savedInstanceState == null) {
mMessageFullname = getIntent().getIntExtra(EXTRA_MESSAGE_FULLNAME, 0); mMessageFullname = getIntent().getIntExtra(EXTRA_MESSAGE_FULLNAME, 0);
mNewAccountName = getIntent().getStringExtra(EXTRA_NEW_ACCOUNT_NAME); mNewAccountName = getIntent().getStringExtra(EXTRA_NEW_ACCOUNT_NAME);

View File

@ -1233,7 +1233,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
getMenuInflater().inflate(R.menu.view_user_detail_activity, menu); getMenuInflater().inflate(R.menu.view_user_detail_activity, menu);
if (username.equals(mAccountName)) { if (username.equals(mAccountName)) {
menu.findItem(R.id.action_send_private_message_view_user_detail_activity).setVisible(false); menu.findItem(R.id.action_send_private_message_view_user_detail_activity).setVisible(false);
menu.findItem(R.id.action_report_view_user_detail_activity).setVisible(false);
menu.findItem(R.id.action_block_user_view_user_detail_activity).setVisible(false); menu.findItem(R.id.action_block_user_view_user_detail_activity).setVisible(false);
} else { } else {
menu.findItem(R.id.action_edit_profile_view_user_detail_activity).setVisible(false); menu.findItem(R.id.action_edit_profile_view_user_detail_activity).setVisible(false);
@ -1299,11 +1298,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
intent.putExtra(PostFilterPreferenceActivity.EXTRA_USER_NAME, username); intent.putExtra(PostFilterPreferenceActivity.EXTRA_USER_NAME, username);
startActivity(intent); startActivity(intent);
return true; return true;
} else if (itemId == R.id.action_report_view_user_detail_activity) {
Intent reportIntent = new Intent(this, LinkResolverActivity.class);
reportIntent.setData(Uri.parse("https://www.reddithelp.com/en/categories/rules-reporting/account-and-community-restrictions/what-should-i-do-if-i-see-something-i"));
startActivity(reportIntent);
return true;
} else if (itemId == R.id.action_block_user_view_user_detail_activity) { } else if (itemId == R.id.action_block_user_view_user_detail_activity) {
if (mAccessToken == null) { if (mAccessToken == null) {
Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();

View File

@ -558,7 +558,7 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
touchHelper.attachToRecyclerView((mCommentsRecyclerView == null ? mRecyclerView : mCommentsRecyclerView)); touchHelper.attachToRecyclerView((mCommentsRecyclerView == null ? mRecyclerView : mCommentsRecyclerView));
} }
mSwipeRefreshLayout.setOnRefreshListener(() -> refresh()); mSwipeRefreshLayout.setOnRefreshListener(() -> refresh(true, true));
mSmoothScroller = new LinearSmoothScroller(activity) { mSmoothScroller = new LinearSmoothScroller(activity) {
@Override @Override

View File

@ -44,10 +44,6 @@
android:title="@string/action_add_to_post_filter" android:title="@string/action_add_to_post_filter"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:id="@+id/action_report_view_user_detail_activity"
android:orderInCategory="9"
android:title="@string/action_report" />
<item <item
android:id="@+id/action_block_user_view_user_detail_activity" android:id="@+id/action_block_user_view_user_detail_activity"