Skip to content
Snippets Groups Projects

0.96 swap fixes

Merged Hans-Christoph Steiner requested to merge eighthave/fdroidclient:0.96-swap-fixes into master

This fixes the swap issues that I could find, except for #391 (closed). @mvdan feel free to beat @pserwylo to this, I just assigned it to him because its swap.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • I forgot to add: this also triggers the index update when FDroid is first started, i.e. onCreate(). I couldn't figure out how to do it in onResume() without having it triggered while navigating around FDroid itself.

  • Added 1 commit:

    • 50e7d72b - temporarily disable broken HTTPS support in swap
  • onResume() is called every time you return to the app, so it would get triggered when you press back from any child activity like AppDetails or SearchResults. This is the kind of thing I said would be annoying :)

    Have you tried onStart()? IIRC it's a midpoint between create and resume. There are docs that explain the differences between all of these.

  • If you want to change that behaviour, though, I would do it after the stable. Unless it fixes a specific bug that is very important.

  • I tried onStart() and it seemed to be called in between FDroid Activities also. I'll remove that commit for now. For some reason, I thought it was something that needed to happen as part of the new update stuff, but I think it can wait.

  • Added 8 commits:

    • 50e7d72b...ee85533a - 5 commits from branch fdroid:master
    • 9e939131 - Utils.calcFingerprint() should always return null if given null
    • 04e318c9 - force swap X.509 cert generation to use English/Gregorian times
    • 303de3d9 - temporarily disable broken HTTPS support in swap
  • Rebased on master and removed the commit that triggered the index update in onCreate(). It looks to me that everything currently in master should go into stable-0.96 so I made this requests against master rather than stable-0.96. I can change that if need be.

  • Yep, nothing in master should be kept from the stable so I'm currently keeping the two branches on par.

    LGTM, I'll merge and we can do the final alpha once we figure out how to disable proguard minification.

  • Daniel Martí Status changed to merged

    Status changed to merged

  • Daniel Martí mentioned in commit cbaa8676

    mentioned in commit cbaa8676

Please register or sign in to reply
Loading