Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e080c42a authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge branch 'master' into synchronize-on-wifi-only 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
parents 5e48d8c6 d5693c5a

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class PreferencesFragment extends PreferenceFragment { 
            Boolean darkTheme = (Boolean) newValue;

            Notes.setAppTheme(darkTheme);

            getActivity().setResult(Activity.RESULT_OK);

            getActivity().finish();

            getActivity().recreate();

            return true;

        });