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

With lazy loading of contributions #3566

Merged
merged 48 commits into from
May 28, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
3adf1e3
With lazy loading of contributions
maskaravivek Mar 23, 2020
27a8352
With contribution fetch
maskaravivek Mar 23, 2020
0537470
fix display of contributions
maskaravivek Apr 16, 2020
5dd362c
more changes
maskaravivek Apr 17, 2020
b9ed4e5
Bugfix/contributions pagination (#5)
ashishkumar468 Apr 20, 2020
6e3c61a
Merge branch 'master' into lazyContributions
maskaravivek Apr 20, 2020
d0b127b
Merge branch 'lazyContributions' of https://github.com/maskaravivek/a…
maskaravivek Apr 20, 2020
25884ca
Merge branch 'master' into lazyContributions
maskaravivek Apr 21, 2020
2c1e271
Fix build
maskaravivek Apr 21, 2020
1e12d31
minor fixes
maskaravivek Apr 21, 2020
22fd8e9
Delete and save contribution with correct pageid when upload succeeds
maskaravivek Apr 23, 2020
854ab5c
Merge branch 'master' into lazyContributions
maskaravivek Apr 26, 2020
5d2216b
fix build
maskaravivek Apr 26, 2020
da1b3cc
Code review comments
maskaravivek May 7, 2020
e93e491
With paging library added
maskaravivek May 7, 2020
d2f9029
Address code review comments
maskaravivek May 7, 2020
6c54e35
Add boundary callback
maskaravivek May 8, 2020
8d62704
Minor changes
maskaravivek May 8, 2020
26cf097
Minor changes
maskaravivek May 9, 2020
abba64d
Merge branch 'master' into lazyContributions
maskaravivek May 9, 2020
971cb29
Minor fixes
maskaravivek May 9, 2020
050dd87
Fix test case
maskaravivek May 9, 2020
5f32477
Minor
maskaravivek May 9, 2020
6ba2736
update saved state
maskaravivek May 9, 2020
3fb265a
Fix test
maskaravivek May 10, 2020
def6ecc
With more test cases
maskaravivek May 10, 2020
34bd6f6
With java docs
maskaravivek May 10, 2020
0842da7
With code review comments
maskaravivek May 11, 2020
ee70c21
With build fix
maskaravivek May 11, 2020
ab97455
Minor changes
maskaravivek May 12, 2020
aa88926
Merge branch 'master' into lazyContributions
maskaravivek May 12, 2020
d23115b
Address code review comments
maskaravivek May 13, 2020
85f48a9
Minor
maskaravivek May 14, 2020
bb4f91c
Use ktx library
maskaravivek May 14, 2020
edb828e
Fix loading of contributions on upload
maskaravivek May 14, 2020
ee6f5bf
Merge branch 'master' into lazyContributions
maskaravivek May 20, 2020
e1e761b
Fix test
maskaravivek May 20, 2020
193ed2a
Merge branch 'lazyContributions' of github.com:maskaravivek/apps-andr…
maskaravivek May 20, 2020
9ca4662
Handle end of list for user media
maskaravivek May 20, 2020
66ec641
Init continuation exists
maskaravivek May 21, 2020
cf0393c
More changes
maskaravivek May 24, 2020
6b7ac2b
Fix minor UI issues
maskaravivek May 26, 2020
a4dfc1d
Merge branch 'master' into lazyContributions
maskaravivek May 26, 2020
92336f5
With minor
maskaravivek May 26, 2020
3260bc7
Fix test
maskaravivek May 26, 2020
ac2898b
Replace direct scheduler with completable
maskaravivek May 26, 2020
2eb67c5
Fix code review comments
maskaravivek May 27, 2020
5f12c5f
Merge branch 'master' into lazyContributions
maskaravivek May 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test
  • Loading branch information
maskaravivek committed May 10, 2020
commit 3fb265a0722a42b7777353856e2ad105e447b37c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ContributionBoundaryCallback extends PagedList.BoundaryCallback<Con
public ContributionBoundaryCallback(final ContributionsRepository repository,
final SessionManager sessionManager,
final MediaClient mediaClient,
@Named(CommonsApplicationModule.IO_THREAD) Scheduler ioThreadScheduler) {
@Named(CommonsApplicationModule.IO_THREAD) final Scheduler ioThreadScheduler) {
super();
macgills marked this conversation as resolved.
Show resolved Hide resolved
this.ioThreadScheduler = ioThreadScheduler;
networkState = new MutableLiveData();
Expand All @@ -48,19 +48,13 @@ public MutableLiveData getNetworkState() {
return networkState;
}

public MutableLiveData getInitialLoading() {
return initialLoading;
}

@Override
public void onZeroItemsLoaded() {
Timber.d("On zero item loaded");
fetchContributions();
}

@Override
public void onItemAtFrontLoaded(@NonNull final Contribution itemAtFront) {
Timber.d("On item front");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,15 @@ class ContributionBoundaryCallbackTest {
@Throws(Exception::class)
fun setUp() {
MockitoAnnotations.initMocks(this)
scheduler = Schedulers.io()

scheduler = Schedulers.trampoline()
contributionBoundaryCallback = ContributionBoundaryCallback(repository, sessionManager, mediaClient, scheduler);
whenever(repository.fetchContributions())
.thenReturn(createMockDataSourceFactory(listOf(mock(Contribution::class.java))))
}

@Test
fun testFetchContributions() {
whenever(sessionManager.userName).thenReturn("Test")
whenever(mediaClient.getMediaListForUser(anyString())).thenReturn(
Single.just(Arrays.asList(mock(Media::class.java)))
Single.just(listOf(mock(Media::class.java)))
)
contributionBoundaryCallback.fetchContributions()
verify(repository, times(1)).save(anyList());
Expand Down