Browse Source

Merge pull request #27 from Thodoris1999/develop

two issue fixes
pull/30/merge
Apostolos Fanakis 7 years ago
committed by GitHub
parent
commit
12c40ebd4d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java
  2. 1
      app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java

2
app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java

@ -32,13 +32,11 @@ public class SettingsActivity extends BaseActivity {
createDrawer(); createDrawer();
drawer.setSelection(SETTINGS_ID); drawer.setSelection(SETTINGS_ID);
if (savedInstanceState == null) {
preferenceFragment = SettingsFragment.newInstance(sessionManager.isLoggedIn()); preferenceFragment = SettingsFragment.newInstance(sessionManager.isLoggedIn());
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.add(R.id.pref_container, preferenceFragment); fragmentTransaction.add(R.id.pref_container, preferenceFragment);
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
}
@Override @Override
protected void onResume() { protected void onResume() {

1
app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java

@ -845,6 +845,7 @@ public class TopicActivity extends BaseActivity {
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
changePage(numberOfPages - 1);
progressBar.setVisibility(ProgressBar.VISIBLE); progressBar.setVisibility(ProgressBar.VISIBLE);
paginationEnabled(false); paginationEnabled(false);
replyFAB.setEnabled(false); replyFAB.setEnabled(false);

Loading…
Cancel
Save