From be11d3dbbc63ff7162a2a6625db45a2ea7cc851d Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Mon, 22 Jul 2024 02:58:27 +0200 Subject: [PATCH] Fix notebook directory not being created, fix NewFileDialog when no last used type, by @gsantner closes #2360 --- .../java/net/gsantner/markor/activity/MainActivity.java | 8 ++++++++ .../java/net/gsantner/markor/frontend/NewFileDialog.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index 0428e9b26..4bfc88b81 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -72,6 +72,14 @@ public class MainActivity extends MarkorBaseActivity implements GsFileBrowserFra protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); IS_DEBUG_ENABLED |= BuildConfig.IS_TEST_BUILD; + + try { + //noinspection ResultOfMethodCallIgnored + _appSettings.getNotebookDirectory().mkdirs(); + } catch (Exception ignored) { + } + + _cu = new MarkorContextUtils(this); setContentView(R.layout.main__activity); _bottomNav = findViewById(R.id.bottom_navigation_bar); diff --git a/app/src/main/java/net/gsantner/markor/frontend/NewFileDialog.java b/app/src/main/java/net/gsantner/markor/frontend/NewFileDialog.java index e1de03374..a3fd00df3 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/NewFileDialog.java +++ b/app/src/main/java/net/gsantner/markor/frontend/NewFileDialog.java @@ -342,7 +342,8 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { // Initial creation - loop through and set type final int lastUsedType = appSettings.getNewFileDialogLastUsedType(); - typeSpinner.setSelection(GsCollectionUtils.indices(formats, f -> f.format == lastUsedType).get(0)); + final List indices = GsCollectionUtils.indices(formats, f -> f.format == lastUsedType); + typeSpinner.setSelection(indices.isEmpty() ? 0 : indices.get(0)); titleEdit.requestFocus();