Browse Source
Merge pull request #27 from Thodoris1999/develop
two issue fixes
pull/30/merge
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
6 deletions
-
app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java
-
app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
|
|
@ -32,12 +32,10 @@ public class SettingsActivity extends BaseActivity { |
|
|
|
createDrawer(); |
|
|
|
drawer.setSelection(SETTINGS_ID); |
|
|
|
|
|
|
|
if (savedInstanceState == null) { |
|
|
|
preferenceFragment = SettingsFragment.newInstance(sessionManager.isLoggedIn()); |
|
|
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); |
|
|
|
fragmentTransaction.add(R.id.pref_container, preferenceFragment); |
|
|
|
fragmentTransaction.commit(); |
|
|
|
} |
|
|
|
preferenceFragment = SettingsFragment.newInstance(sessionManager.isLoggedIn()); |
|
|
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); |
|
|
|
fragmentTransaction.add(R.id.pref_container, preferenceFragment); |
|
|
|
fragmentTransaction.commit(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
@ -845,6 +845,7 @@ public class TopicActivity extends BaseActivity { |
|
|
|
|
|
|
|
@Override |
|
|
|
protected void onPreExecute() { |
|
|
|
changePage(numberOfPages - 1); |
|
|
|
progressBar.setVisibility(ProgressBar.VISIBLE); |
|
|
|
paginationEnabled(false); |
|
|
|
replyFAB.setEnabled(false); |
|
|
|