Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into exo-player

This commit is contained in:
ByteHamster 2018-04-22 21:33:19 +02:00
parent c977e70106 9d3d92cc9d
commit 2bc3ca711c
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
View File

@ -113,16 +113,18 @@ public class PreferenceActivity extends AppCompatActivity {
}
public static class MainFragment extends PreferenceFragment {
private int screen;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setRetainInstance(true);
addPreferencesFromResource(getArguments().getInt(PARAM_RESOURCE));
screen = getArguments().getInt(PARAM_RESOURCE);
addPreferencesFromResource(screen);
PreferenceActivity activity = instance.get();
if (activity != null && activity.preferenceController != null) {
activity.preferenceUI.setFragment(this);
activity.preferenceController.onCreate(getArguments().getInt(PARAM_RESOURCE));
activity.preferenceController.onCreate(screen);
}
}
@ -131,9 +133,9 @@ public class PreferenceActivity extends AppCompatActivity {
super.onResume();
PreferenceActivity activity = instance.get();
if(activity != null && activity.preferenceController != null) {
activity.setTitle(getTitle(getArguments().getInt(PARAM_RESOURCE)));
activity.setTitle(getTitle(screen));
activity.preferenceUI.setFragment(this);
activity.preferenceController.onResume(getArguments().getInt(PARAM_RESOURCE));
activity.preferenceController.onResume(screen);
}
}
@ -159,9 +161,8 @@ public class PreferenceActivity extends AppCompatActivity {
@Override
public void onPause() {
PreferenceActivity activity = instance.get();
if(activity != null && activity.preferenceController != null) {
activity.preferenceUI.setFragment(this);
activity.preferenceController.onPause(getArguments().getInt(PARAM_RESOURCE));
if (screen == R.xml.preferences_integrations) {
activity.preferenceController.unregisterGpodnet();
}
super.onPause();
}
@ -169,9 +170,8 @@ public class PreferenceActivity extends AppCompatActivity {
@Override
public void onStop() {
PreferenceActivity activity = instance.get();
if(activity != null && activity.preferenceController != null) {
activity.preferenceUI.setFragment(this);
activity.preferenceController.onStop();
if (screen == R.xml.preferences_storage) {
activity.preferenceController.unsubscribeExportSubscription();
}
super.onStop();
}

8
app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
View File

@ -633,13 +633,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
}
}
public void onPause(int screen) {
if (screen == R.xml.preferences_integrations) {
GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
}
public void unregisterGpodnet() {
GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
}
public void onStop() {
public void unsubscribeExportSubscription() {
if (subscription != null) {
subscription.unsubscribe();
}