Skip to content
This repository was archived by the owner on Jun 14, 2022. It is now read-only.

Conversation

mantinan
Copy link
Contributor

@mantinan mantinan commented Aug 7, 2020

We had to add pin input and some other stuff.

This has been lagging around due to several things.
I have also struggled to get my branch in sync with master, so I have
built patches and applied them directly to mater here.
Let's see if this time I can finally get this pushed and submit a pull request.
@mantinan mantinan mentioned this pull request Aug 7, 2020
@mantinan
Copy link
Contributor Author

mantinan commented Aug 7, 2020

I just realised that we had changed defaults at app/src/main/java/org/shadowice/flocke/andotp/Activities/IntroScreenActivity.java and that is probably something that you don't want. Sorry about that.

@flocke flocke self-assigned this Aug 7, 2020
@flocke flocke added this to the v0.8.1 milestone Aug 7, 2020
@flocke flocke self-requested a review August 7, 2020 14:11
Rewrite MD5 calculator to use Java's md5 implementation
Remove MD5.java
@mantinan
Copy link
Contributor Author

Ok, I have reviewed it again and have returned to your defaults and also removed the MD5 implementation and recoded it based on Java's one.

@flocke
Copy link
Member

flocke commented Mar 3, 2021

I will look over the code in the next couple of days (hopefully).
But I already have a request: could you remove all translations except the English one?
Translations are handled on Crowdin and the ones you added here will be overwritten if I import the new ones from there.
This will also make it a lot easier to resolve the merge conflicts.

@mantinan
Copy link
Contributor Author

mantinan commented Mar 4, 2021

Restored all language files and commited it, hope that fits what you wanted.

Copy link
Member

@flocke flocke left a comment

Choose a reason for hiding this comment

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

I reviewed the code and found some parts that needed changing. Most of those were introduced by changes I made to the codebase after you already submitted the pull request.
I fixed them locally and created a patch file you can use to update your branch: 0001-Make-MOTP-work-with-the-newest-andOTP-codebase.patch.txt
I will merge the pull request after you add those changes.

I also included some minor improvements (like using the Hex class from Apache Commons Codec for all Hex-related functions and validating the secret when manually entering it).

@flocke flocke merged commit cca3972 into andOTP:master Mar 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants