mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-02-15 02:18:45 +01:00
Compare commits
No commits in common. "b69245aedc543fc7f8da1c0e41cf1ba3f16f92e9" and "2ea47cf7fd01fbd4e1707c6cf4281d3dbe728ac5" have entirely different histories.
b69245aedc
...
2ea47cf7fd
@ -392,14 +392,6 @@ 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);
|
||||||
|
@ -1233,6 +1233,7 @@ 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);
|
||||||
@ -1298,6 +1299,11 @@ 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();
|
||||||
|
@ -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(true, true));
|
mSwipeRefreshLayout.setOnRefreshListener(() -> refresh());
|
||||||
|
|
||||||
mSmoothScroller = new LinearSmoothScroller(activity) {
|
mSmoothScroller = new LinearSmoothScroller(activity) {
|
||||||
@Override
|
@Override
|
||||||
|
@ -44,6 +44,10 @@
|
|||||||
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"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user