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.

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

Enhancement: Fixes #765 & uses updated kiwix-lib method #1537

Merged
merged 8 commits into from
Nov 29, 2019
Merged

Conversation

Aditya-Sood
Copy link
Contributor

Fixes #765

Changes: Updates ZimFileReader (& AutoCompleteAdapter) to use the updated getNextSuggestion() method available in kiwix-lib (which directly returns the url corresponding to a suggestion term, avoiding an additional call to getPageUrlFromTitle())

IMPORTANT: Before merging this PR, the gradle file must be updated to use the kiwix-lib version post the merging of complimentary PR to kiwix-lib, since it depends on the changes to JNIKiwixReader in that PR

@stale
Copy link

stale bot commented Oct 8, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be now be reviewed manually. Thank you for your contributions.

@stale stale bot added the stale label Oct 8, 2019
@kelson42
Copy link
Collaborator

kelson42 commented Oct 8, 2019

@Aditya-Sood Do you think you will be able to fix the PR in the next days?

@stale stale bot removed the stale label Oct 8, 2019
@stale
Copy link

stale bot commented Oct 15, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be now be reviewed manually. Thank you for your contributions.

@stale stale bot added stale and removed stale labels Oct 15, 2019
@Aditya-Sood
Copy link
Contributor Author

@kelson42 @macgills terribly sorry for disappearing. I had my mid semester exams earlier this month, and since a week after that the placement coding rounds have begun, which is why I couldn't follow up

I'll fix this latest by tomorrow night

Again, really sorry for the inconvenience. Next time I'll be careful to communicate beforehand if I'm going to be busy

@stale
Copy link

stale bot commented Oct 28, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be now be reviewed manually. Thank you for your contributions.

@stale stale bot added the stale label Oct 28, 2019
@kelson42
Copy link
Collaborator

kelson42 commented Nov 5, 2019

@Aditya-Sood ping?

@stale stale bot removed the stale label Nov 5, 2019
@Aditya-Sood
Copy link
Contributor Author

@kelson42 terribly sorry for the delay, it's been updated to the current modularised develop code
IMP: I'll have to change the kiwix-lib version in the core-gradle file to the next version of kiwix-lib before this is merged (since my changes got merged after 8.1.0 was released). So merging will have to wait until the next version is made available.

macgills
macgills previously approved these changes Nov 12, 2019
Copy link
Contributor

@macgills macgills left a comment

Choose a reason for hiding this comment

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

We will need the updated kiwixlib to be released and the dependency upgraded before this can be merged, as previously stated. @kelson42 When can we expect a kiwix-lib release?

@stale
Copy link

stale bot commented Nov 20, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be now be reviewed manually. Thank you for your contributions.

@stale stale bot added the stale label Nov 20, 2019
@kelson42
Copy link
Collaborator

@macgills I will try to make a new kiwix-lib release to unblock that PR.

@stale stale bot removed the stale label Nov 20, 2019
@kelson42
Copy link
Collaborator

@macgills @Aditya-Sood Kiwix-lib 8.2.0 has been published https://bintray.com/kiwix/kiwix/kiwixlib/8.2.0

@kelson42
Copy link
Collaborator

@Aditya-Sood Could you please do the small upgrade an merge this please?

@Aditya-Sood
Copy link
Contributor Author

@kelson42 @macgills I have tried changing the kiwix-lib version directly in Versions.kt to 8.2.0 but that always gave a Could not find org.kiwix.kiwixlib:kiwixlib:8.2.0 error. (Invalidating caches and re-building didn't help either)

I also ran the ./gradlew buildSrcVersions command to check if the new version is available but it didn't add 8.2.0 as a comment.

Could you guide me on how to test the new version?
Also really sorry for not responding since last week, my end-semester exams were on then followed by ongoing placement tests, so I wasn't able to find the time

@macgills
Copy link
Contributor

@kelson42 kiwix-lib was uploaded to bintray without a pom.xml, I am not sure how the build is triggered on kiwix-build but matthieu had it set up to use the android project to build the pom and it was definitely working for 8.1.0

@Aditya-Sood everything you did there was correct 👍

@kelson42
Copy link
Collaborator

@macgills No clue... Can we delete this on bintray so I can retry again to publish?

@kelson42
Copy link
Collaborator

@macgills @Aditya-Sood Sorry for the wrong attemps. I have regenerated 8.2.1 and this time the pom.xml is part of it. Should be OK.

@Aditya-Sood
Copy link
Contributor Author

@kelson42 @macgills I've made the update and it's working on my phone, ready to merge 👍

@codecov
Copy link

codecov bot commented Nov 29, 2019

Codecov Report

Merging #1537 into develop will increase coverage by 0.49%.
The diff coverage is 0%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1537      +/-   ##
=============================================
+ Coverage      35.77%   36.27%   +0.49%     
- Complexity         5       31      +26     
=============================================
  Files            221      236      +15     
  Lines           7334     7438     +104     
  Branches         769      788      +19     
=============================================
+ Hits            2624     2698      +74     
- Misses          4442     4468      +26     
- Partials         268      272       +4
Impacted Files Coverage Δ Complexity Δ
...x/kiwixmobile/core/search/AutoCompleteAdapter.java 17.3% <0%> (-0.34%) 0 <0> (ø)
.../kiwix/kiwixmobile/core/search/SearchSuggestion.kt 0% <0%> (ø) 0 <0> (?)
...org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt 3.41% <0%> (-0.13%) 0 <0> (ø)
...kiwixmobile/core/extensions/ImageViewExtensions.kt 16.66% <0%> (-50%) 0% <0%> (ø)
...wixmobile/core/downloader/model/DownloadRequest.kt 66.66% <0%> (-10.26%) 0% <0%> (ø)
.../kiwixmobile/core/downloader/model/DownloadItem.kt 69.04% <0%> (-8.1%) 0% <0%> (ø)
...iwix/kiwixmobile/core/downloader/DownloaderImpl.kt 80% <0%> (-7.5%) 0% <0%> (ø)
...org/kiwix/kiwixmobile/language/LanguageActivity.kt 64.44% <0%> (-4.45%) 0% <0%> (ø)
...x/kiwixmobile/core/bookmark/BookmarksActivity.java 31.48% <0%> (-2.78%) 0% <0%> (ø)
...iwix/kiwixmobile/zim_manager/ZimManageViewModel.kt 83.61% <0%> (-0.43%) 0% <0%> (ø)
... and 43 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1882523...42a53e3. Read the comment docs.

@macgills macgills merged commit 43f5f9b into develop Nov 29, 2019
@macgills macgills deleted the issue/765 branch November 29, 2019 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Convert search activity to use URLs not titles
3 participants