Skip to content

fix: Use same default keystore values as Morphe Manager#96

Merged
LisoUseInAIKyrios merged 6 commits intoMorpheApp:devfrom
prateek-who:align-keystore
Mar 31, 2026
Merged

fix: Use same default keystore values as Morphe Manager#96
LisoUseInAIKyrios merged 6 commits intoMorpheApp:devfrom
prateek-who:align-keystore

Conversation

@prateek-who
Copy link
Copy Markdown
Contributor

Both keyStoreEntryAlias and keyStoreEntryPassword are now set to "Morphe", which is the default in the manager too.

@LisoUseInAIKyrios LisoUseInAIKyrios changed the title fix: Default keystore matches Manager defaults fix: Use same default keystore values as Morphe Manager Mar 28, 2026
@LisoUseInAIKyrios
Copy link
Copy Markdown
Contributor

This breaks compatibility for users with existing key stores.

What to do?

SEVERE: An unexpected error occurred: Keystore does not contain entry with alias Morphe 
java.lang.IllegalArgumentException: Keystore does not contain entry with alias Morphe

@prateek-who
Copy link
Copy Markdown
Contributor Author

The cli could try the new defaults and if that fails, it can try the old defaults.

@prateek-who
Copy link
Copy Markdown
Contributor Author

Try this once. Worked in my testing, but test it just in case.

Copy link
Copy Markdown
Contributor

@LisoUseInAIKyrios LisoUseInAIKyrios left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code here works for me. Old signing key alias/password is used.

@prateek-who
Copy link
Copy Markdown
Contributor Author

Is this better? I could maybe move the constants inside the Config data class for PatchEngine no? What would be the best practice here?

@prateek-who
Copy link
Copy Markdown
Contributor Author

How about now?

@prateek-who
Copy link
Copy Markdown
Contributor Author

@LisoUseInAIKyrios Unrelated to this: I have been working on a gui-overhaul branch that was branched off the original gui branch that you had merged about 2 weeks ago. I assumed it would stay on the track with dev. But I did not realize how much it had diverged from dev until I tried merging. I tried to see how the merge would go and there are about 40+ conflicts. In some places, dev is ahead and in other places, I need to keep my changes. Worst of all, some files need to have stuff from both the branches in different places. It's basically hell. What is the best way to solve this?

@LisoUseInAIKyrios
Copy link
Copy Markdown
Contributor

Open a draft PR and we can try to fix the merge conflicts together.

@LisoUseInAIKyrios LisoUseInAIKyrios merged commit 2d70c01 into MorpheApp:dev Mar 31, 2026
3 checks passed
github-actions bot pushed a commit that referenced this pull request Mar 31, 2026
## [1.6.4-dev.2](v1.6.4-dev.1...v1.6.4-dev.2) (2026-03-31)

### Bug Fixes

* Use same default keystore values as Morphe Manager ([#96](#96)) ([2d70c01](2d70c01))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants