Skip to content

fix: several android fixes #323

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.

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

Merged
merged 6 commits into from
Nov 24, 2022

Conversation

ShootingKing-AM
Copy link
Contributor

@ShootingKing-AM ShootingKing-AM commented Nov 5, 2022

  • the previous android fix to rocket update was not functional Update rocket to 0.5.0-rc1 #255
  • previous version rocket was async, newer version needs to be awaited
  • reaf'ed code a little

- the previous android fix to rocket update was not functional
- previous version rocket was async, never version needs to be awaited
@codecov
Copy link

codecov bot commented Nov 5, 2022

Codecov Report

Base: 73.32% // Head: 72.83% // Decreases project coverage by -0.49% ⚠️

Coverage data is based on head (f4a5962) compared to base (d6b3992).
Patch coverage: 13.04% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #323      +/-   ##
==========================================
- Coverage   73.32%   72.83%   -0.50%     
==========================================
  Files          45       45              
  Lines        2759     2790      +31     
==========================================
+ Hits         2023     2032       +9     
- Misses        736      758      +22     
Impacted Files Coverage Δ
aw-server/src/logging.rs 0.00% <0.00%> (ø)
aw-server/src/main.rs 0.00% <0.00%> (ø)
aw-sync/src/sync.rs 45.94% <0.00%> (-0.32%) ⬇️
aw-server/src/config.rs 50.84% <100.00%> (+5.56%) ⬆️
aw-server/src/endpoints/mod.rs 81.33% <0.00%> (-1.53%) ⬇️
aw-query/src/functions.rs 83.05% <0.00%> (-0.56%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ShootingKing-AM ShootingKing-AM changed the title fix: pull aw-android's server to current master fix: Sync aw-android's server to current aw-server-rust master Nov 6, 2022
@ShootingKing-AM ShootingKing-AM mentioned this pull request Nov 6, 2022
47 tasks
@ErikBjare
Copy link
Member

Going to have a look after #325 is merged.

@ErikBjare ErikBjare changed the title fix: Sync aw-android's server to current aw-server-rust master fix: several android fixes Nov 24, 2022
@ErikBjare ErikBjare merged commit 8173d57 into ActivityWatch:master Nov 24, 2022
@ErikBjare
Copy link
Member

Merged. Thank you very much Sir! 😄

@ShootingKing-AM
Copy link
Contributor Author

Thank you too Sir ! :D

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