Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes a crash where MastodonAPI isn't initialised in time when opening a profile or block list.

This commit is contained in:
Vavassor 2017-03-27 16:19:44 -04:00
parent 1b7da84960
commit 292c4c3a88
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
View File

@ -52,6 +52,7 @@ public class AccountFragment extends BaseFragment implements AccountActionListen
private Type type; private Type type;
private String accountId; private String accountId;
private LinearLayoutManager layoutManager; private LinearLayoutManager layoutManager;
private RecyclerView recyclerView;
private EndlessOnScrollListener scrollListener; private EndlessOnScrollListener scrollListener;
private AccountAdapter adapter; private AccountAdapter adapter;
private TabLayout.OnTabSelectedListener onTabSelectedListener; private TabLayout.OnTabSelectedListener onTabSelectedListener;
@ -80,7 +81,7 @@ public class AccountFragment extends BaseFragment implements AccountActionListen
Bundle arguments = getArguments(); Bundle arguments = getArguments();
type = Type.valueOf(arguments.getString("type")); type = Type.valueOf(arguments.getString("type"));
accountId = arguments.getString("accountId"); accountId = arguments.getString("accountId");
api = ((BaseActivity) getActivity()).mastodonAPI; api = null;
} }
@Nullable @Nullable
@ -91,7 +92,7 @@ public class AccountFragment extends BaseFragment implements AccountActionListen
View rootView = inflater.inflate(R.layout.fragment_account, container, false); View rootView = inflater.inflate(R.layout.fragment_account, container, false);
Context context = getContext(); Context context = getContext();
RecyclerView recyclerView = (RecyclerView) rootView.findViewById(R.id.recycler_view); recyclerView = (RecyclerView) rootView.findViewById(R.id.recycler_view);
recyclerView.setHasFixedSize(true); recyclerView.setHasFixedSize(true);
layoutManager = new LinearLayoutManager(context); layoutManager = new LinearLayoutManager(context);
recyclerView.setLayoutManager(layoutManager); recyclerView.setLayoutManager(layoutManager);
@ -101,19 +102,7 @@ public class AccountFragment extends BaseFragment implements AccountActionListen
R.drawable.status_divider_dark); R.drawable.status_divider_dark);
divider.setDrawable(drawable); divider.setDrawable(drawable);
recyclerView.addItemDecoration(divider); recyclerView.addItemDecoration(divider);
scrollListener = new EndlessOnScrollListener(layoutManager) { scrollListener = null;
@Override
public void onLoadMore(int page, int totalItemsCount, RecyclerView view) {
AccountAdapter adapter = (AccountAdapter) view.getAdapter();
Account account = adapter.getItem(adapter.getItemCount() - 2);
if (account != null) {
fetchAccounts(account.id, null);
} else {
fetchAccounts();
}
}
};
recyclerView.addOnScrollListener(scrollListener);
if (type == Type.BLOCKS) { if (type == Type.BLOCKS) {
adapter = new BlocksAdapter(this); adapter = new BlocksAdapter(this);
} else { } else {
@ -143,6 +132,28 @@ public class AccountFragment extends BaseFragment implements AccountActionListen
return rootView; return rootView;
} }
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
/* MastodonAPI on the base activity is only guaranteed to be initialised after the parent
* activity is created, so everything needing to access the api object has to be delayed
* until here. */
api = ((BaseActivity) getActivity()).mastodonAPI;
scrollListener = new EndlessOnScrollListener(layoutManager) {
@Override
public void onLoadMore(int page, int totalItemsCount, RecyclerView view) {
AccountAdapter adapter = (AccountAdapter) view.getAdapter();
Account account = adapter.getItem(adapter.getItemCount() - 2);
if (account != null) {
fetchAccounts(account.id, null);
} else {
fetchAccounts();
}
}
};
recyclerView.addOnScrollListener(scrollListener);
}
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
@ -232,6 +243,14 @@ public class AccountFragment extends BaseFragment implements AccountActionListen
} }
public void onBlock(final boolean block, final String id, final int position) { public void onBlock(final boolean block, final String id, final int position) {
if (api == null) {
/* If somehow an unblock button is clicked after onCreateView but before
* onActivityCreated, then this would get called with a null api object, so this eats
* that input. */
Log.d(TAG, "MastodonAPI isn't initialised so this block can't occur.");
return;
}
Callback<Relationship> cb = new Callback<Relationship>() { Callback<Relationship> cb = new Callback<Relationship>() {
@Override @Override
public void onResponse(Call<Relationship> call, Response<Relationship> response) { public void onResponse(Call<Relationship> call, Response<Relationship> response) {