Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to new group id - rebase #1214

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Migrate to new group id - rebase #1214

wants to merge 47 commits into from

Commits on Feb 7, 2023

  1. First changes to DBHelper to adapt to the new group id

    @Altonss
    Altonss authored and Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    53986f8 View commit details
    Browse the repository at this point in the history

  2. Update DBHelper.java 

    Fix typo
    @Altonss
    Altonss authored and Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    5723f83 View commit details
    Browse the repository at this point in the history

  3. Improve DBHelper and adapt Group.java to id changes

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    005f984 View commit details
    Browse the repository at this point in the history

  4. Fix group issues in importer

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    41367b2 View commit details
    Browse the repository at this point in the history

  5. Update ManageGroupCursorAdapter to group id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    e29423f View commit details
    Browse the repository at this point in the history

  6. Update CatimaExporter and LoyaltyCardViewActivity.java

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    dac662c View commit details
    Browse the repository at this point in the history

  7. Further update to group id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    f09b5b0 View commit details
    Browse the repository at this point in the history

  8. Clean up ManageGroupsActivity.java and update tests to new group id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    c05fad8 View commit details
    Browse the repository at this point in the history

  9. Fix ManageGroupsActivity.java because of merge conflicts

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    b35c6fc View commit details
    Browse the repository at this point in the history

  10. Migrate CatimaImporter to group id scheme

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    ca8aa67 View commit details
    Browse the repository at this point in the history

  11. Migrate CatimaImporter to group id scheme

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    13513ef View commit details
    Browse the repository at this point in the history

  12. Fix updateMissingGroup test

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    290329e View commit details
    Browse the repository at this point in the history

  13. Fix addRemoveOneGroup test

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    cee30cd View commit details
    Browse the repository at this point in the history

  14. Fix typo in DBHelper migration to v16 database

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    bcae682 View commit details
    Browse the repository at this point in the history

  15. Fix the join for database version migration

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    2f5c51e View commit details
    Browse the repository at this point in the history

  16. Update DBHelper.java 

    Add ID column to tmpDbGroups
    @Altonss
    Altonss authored and Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    b2f3748 View commit details
    Browse the repository at this point in the history

  17. Update DatabaseTest.java 

    Move to group.name in DatabaseTest.java
    @Altonss
    Altonss authored and Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    6fbbec8 View commit details
    Browse the repository at this point in the history

  18. Update DatabaseTest.java 

    Migrate to group.name in DatabaseTest.java
    @Altonss
    Altonss authored and Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    42d2e6c View commit details
    Browse the repository at this point in the history

  19. Fix DatabaseTest.java

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    22598a7 View commit details
    Browse the repository at this point in the history

  20. Fix MainActivity.java : group._id was still used instead of group.name

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    64b6972 View commit details
    Browse the repository at this point in the history

  21. Fix importGroup

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    ee3126b View commit details
    Browse the repository at this point in the history

  22. Add extra check to not insert new group with duplicate name

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    d7c0b64 View commit details
    Browse the repository at this point in the history

  23. Add extra check to not insert new group with duplicate name

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    7127354 View commit details
    Browse the repository at this point in the history

  24. Fix group id that was still used in GroupCursorAdapter instead of name

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    b1b3882 View commit details
    Browse the repository at this point in the history

  25. Fix handling of group in importCardGroupMappingV3

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    ccce7e5 View commit details
    Browse the repository at this point in the history

  26. Remove strangely failing test to see what happens during the unit tes… 

    …t...
    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    d7571cb View commit details
    Browse the repository at this point in the history

  27. Revert "Remove strangely failing test to see what happens during the … 

    …unit test..."

This reverts commit ed724b8.
    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    04c73bc View commit details
    Browse the repository at this point in the history

  28. Rewrite some failing tests because of list order

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    e292d64 View commit details
    Browse the repository at this point in the history

  29. Remove not necessary order by group id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    aad7648 View commit details
    Browse the repository at this point in the history

  30. Remove unused lines

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    387e46b View commit details
    Browse the repository at this point in the history

  31. Fix version number in parseV3 error message

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    2eb2301 View commit details
    Browse the repository at this point in the history

  32. Improved importGroupV3 handling

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    51f6999 View commit details
    Browse the repository at this point in the history

  33. Add tests by group id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    8559272 View commit details
    Browse the repository at this point in the history

  34. Remove useless groupName usage

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    32653d1 View commit details
    Browse the repository at this point in the history

  35. Add group order to export and import

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    de46f0b View commit details
    Browse the repository at this point in the history

  36. Removed unused equals and hashCode methods in Group class

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    e5d4fcc View commit details
    Browse the repository at this point in the history

  37. Revert back to the use of whereAttrs, withArgs

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    600a854 View commit details
    Browse the repository at this point in the history

  38. Check if the new name already exists before updating group

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    f174a61 View commit details
    Browse the repository at this point in the history

  39. Fix alphabetical ordering of groups

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    f17bdaa View commit details
    Browse the repository at this point in the history

  40. Move addGroup to id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    aab75f4 View commit details
    Browse the repository at this point in the history

  41. Move addGroup to id

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    e0afb47 View commit details
    Browse the repository at this point in the history

  42. Fix import

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    615fb96 View commit details
    Browse the repository at this point in the history

  43. Fix usage copyOf (too high api level)

    Altonss committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    5df9078 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Update app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.… 

    …java

Co-authored-by: Sylvia van Os <[email protected]>
    @Altonss @TheLastProject
    Altonss and TheLastProject authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    bffe3d7 View commit details
    Browse the repository at this point in the history

  2. Fix getTabAt

    Altonss committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    af85386 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'my-repo/group-id' into group-id

    Altonss committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    344b198 View commit details
    Browse the repository at this point in the history

  4. reuse same type as parseV2

    Altonss committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    7c0b611 View commit details
    Browse the repository at this point in the history