Skip to content
Permalink
Browse files Browse the repository at this point in the history
fix GHSL-2021-1033
Signed-off-by: David Luhmer <david-dev@live.de>
  • Loading branch information
David-Development committed Oct 26, 2021
1 parent 4cac4d5 commit 05449cb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
Expand Up @@ -981,8 +981,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
}

private void ensureCorrectTheme(Intent data) {
String oldListLayout = data.getStringExtra(SettingsActivity.SP_FEED_LIST_LAYOUT);
String newListLayout = mPrefs.getString(SettingsActivity.SP_FEED_LIST_LAYOUT,"0");
String oldListLayout = data.getStringExtra(SettingsActivity.AI_FEED_LIST_LAYOUT);
String newListLayout = mPrefs.getString(SettingsActivity.SP_FEED_LIST_LAYOUT, "0");

if (ThemeChooser.themeRequiresRestartOfUI() || !newListLayout.equals(oldListLayout)) {
NewsReaderListActivity.this.recreate();
Expand Down
Expand Up @@ -34,8 +34,6 @@

import de.luhmer.owncloudnewsreader.helper.ThemeChooser;

import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN;

/**
* A {@link PreferenceActivity} that presents a set of application settings. On
* handset devices, settings are presented as a single list. On tablets,
Expand Down Expand Up @@ -84,7 +82,8 @@ public class SettingsActivity extends AppCompatActivity {
public static final String SP_APP_THEME = "sp_app_theme";
public static final String CB_OLED_MODE = "cb_oled_mode";

public static final String SP_FEED_LIST_LAYOUT = "sp_feed_list_layout";
public static final String SP_FEED_LIST_LAYOUT = "sp_feed_list_layout"; // used for shared prefs
public static final String AI_FEED_LIST_LAYOUT = "ai_feed_list_layout"; // used for intents
public static final String SP_FONT_SIZE = "sp_font_size";

public static final String CACHE_CLEARED = "CACHE_CLEARED";
Expand Down Expand Up @@ -148,11 +147,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
@Override
protected void onStart() {
super.onStart();
Intent intent = getIntent();
intent.putExtra(
SettingsActivity.SP_FEED_LIST_LAYOUT,
mPrefs.getString(SettingsActivity.SP_FEED_LIST_LAYOUT, "0")
);
setResult(RESULT_OK,intent);

// Fix GHSL-2021-1033
Intent intent = new Intent();
String feedListLayout = mPrefs.getString(SettingsActivity.SP_FEED_LIST_LAYOUT, "0");
intent.putExtra(SettingsActivity.AI_FEED_LIST_LAYOUT, feedListLayout);
setResult(RESULT_OK, intent);
}
}

0 comments on commit 05449cb

Please sign in to comment.