mirror of
https://github.com/MinimalBible/MinimalBible-Legacy
synced 2024-11-16 04:58:26 -05:00
Fix the dagger compile errors
If you have an @Singleton with no @Injects inside it, you need to add an @Injects constructor for Dagger to validate.
This commit is contained in:
parent
28dfec81d7
commit
7070c933d1
@ -3,7 +3,6 @@ package org.bspeice.minimalbible.activities.downloader;
|
|||||||
import org.bspeice.minimalbible.MinimalBible;
|
import org.bspeice.minimalbible.MinimalBible;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadManager;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadThread;
|
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadThread;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
||||||
|
|
||||||
@ -17,12 +16,10 @@ import de.devland.esperandro.Esperandro;
|
|||||||
@Module(
|
@Module(
|
||||||
injects = {
|
injects = {
|
||||||
BookListFragment.class,
|
BookListFragment.class,
|
||||||
DownloadManager.class,
|
|
||||||
BookItemHolder.class,
|
BookItemHolder.class,
|
||||||
BookDownloadManager.class,
|
BookDownloadManager.class,
|
||||||
BookDownloadThread.class,
|
BookDownloadThread.class,
|
||||||
RefreshManager.class,
|
RefreshManager.class
|
||||||
InstalledManager.class
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
public class ActivityDownloaderModule {
|
public class ActivityDownloaderModule {
|
||||||
|
@ -11,11 +11,8 @@ import org.bspeice.minimalbible.MinimalBible;
|
|||||||
import org.bspeice.minimalbible.R;
|
import org.bspeice.minimalbible.R;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadManager;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DLProgressEvent;
|
import org.bspeice.minimalbible.activities.downloader.manager.DLProgressEvent;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
||||||
import org.crosswire.jsword.book.Book;
|
import org.crosswire.jsword.book.Book;
|
||||||
import org.crosswire.jsword.book.BookException;
|
|
||||||
import org.crosswire.jsword.book.Books;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
@ -24,7 +21,6 @@ import butterknife.InjectView;
|
|||||||
import butterknife.OnClick;
|
import butterknife.OnClick;
|
||||||
import rx.Subscription;
|
import rx.Subscription;
|
||||||
import rx.android.schedulers.AndroidSchedulers;
|
import rx.android.schedulers.AndroidSchedulers;
|
||||||
import rx.functions.Action1;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by bspeice on 5/20/14.
|
* Created by bspeice on 5/20/14.
|
||||||
|
@ -15,7 +15,6 @@ import android.widget.Toast;
|
|||||||
import org.bspeice.minimalbible.MinimalBible;
|
import org.bspeice.minimalbible.MinimalBible;
|
||||||
import org.bspeice.minimalbible.R;
|
import org.bspeice.minimalbible.R;
|
||||||
import org.bspeice.minimalbible.activities.BaseFragment;
|
import org.bspeice.minimalbible.activities.BaseFragment;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
||||||
import org.crosswire.jsword.book.Book;
|
import org.crosswire.jsword.book.Book;
|
||||||
import org.crosswire.jsword.book.BookCategory;
|
import org.crosswire.jsword.book.BookCategory;
|
||||||
@ -49,9 +48,7 @@ public class BookListFragment extends BaseFragment {
|
|||||||
@InjectView(R.id.lst_download_available)
|
@InjectView(R.id.lst_download_available)
|
||||||
ListView downloadsAvailable;
|
ListView downloadsAvailable;
|
||||||
|
|
||||||
@Inject DownloadManager downloadManager;
|
|
||||||
@Inject RefreshManager refreshManager;
|
@Inject RefreshManager refreshManager;
|
||||||
|
|
||||||
@Inject DownloadPrefs downloadPrefs;
|
@Inject DownloadPrefs downloadPrefs;
|
||||||
|
|
||||||
private ProgressDialog refreshDialog;
|
private ProgressDialog refreshDialog;
|
||||||
|
@ -12,7 +12,6 @@ import org.crosswire.jsword.book.Books;
|
|||||||
import org.crosswire.jsword.book.BooksEvent;
|
import org.crosswire.jsword.book.BooksEvent;
|
||||||
import org.crosswire.jsword.book.BooksListener;
|
import org.crosswire.jsword.book.BooksListener;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@ -20,10 +19,7 @@ import javax.inject.Inject;
|
|||||||
import javax.inject.Provider;
|
import javax.inject.Provider;
|
||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
|
|
||||||
import rx.Observable;
|
|
||||||
import rx.subjects.PublishSubject;
|
import rx.subjects.PublishSubject;
|
||||||
import rx.subjects.ReplaySubject;
|
|
||||||
import rx.subjects.Subject;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper to convert JSword progress events to MinimalBible EventBus-based
|
* Wrapper to convert JSword progress events to MinimalBible EventBus-based
|
||||||
|
@ -11,6 +11,7 @@ import org.crosswire.jsword.book.sword.SwordBookPath;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
|
|
||||||
// TODO: Listen to BookInstall events?
|
// TODO: Listen to BookInstall events?
|
||||||
@ -26,6 +27,7 @@ public class DownloadManager {
|
|||||||
/**
|
/**
|
||||||
* Set up the DownloadManager, and notify jSword of where it should store files at
|
* Set up the DownloadManager, and notify jSword of where it should store files at
|
||||||
*/
|
*/
|
||||||
|
@Inject
|
||||||
public DownloadManager() {
|
public DownloadManager() {
|
||||||
MinimalBible.getApplication().inject(this);
|
MinimalBible.getApplication().inject(this);
|
||||||
setDownloadDir();
|
setDownloadDir();
|
||||||
|
@ -22,6 +22,8 @@ public class InstalledManager implements BooksListener {
|
|||||||
private Books installedBooks;
|
private Books installedBooks;
|
||||||
private List<Book> installedBooksList;
|
private List<Book> installedBooksList;
|
||||||
|
|
||||||
|
@Inject InstalledManager() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register our manager to receive events on Book install
|
* Register our manager to receive events on Book install
|
||||||
* This is a relatively expensive operation,
|
* This is a relatively expensive operation,
|
||||||
|
@ -55,6 +55,7 @@ public class DownloadActivityTest extends InstrumentationTestCase {
|
|||||||
/**
|
/**
|
||||||
* When we start a download, make sure a progress event of 0 is triggered.
|
* When we start a download, make sure a progress event of 0 is triggered.
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
public void testInitialProgressEventOnDownload() throws InterruptedException {
|
public void testInitialProgressEventOnDownload() throws InterruptedException {
|
||||||
final CountDownLatch signal = new CountDownLatch(1);
|
final CountDownLatch signal = new CountDownLatch(1);
|
||||||
|
|
||||||
@ -85,6 +86,7 @@ public class DownloadActivityTest extends InstrumentationTestCase {
|
|||||||
fail("Event did not trigger!");
|
fail("Event did not trigger!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test that we can successfully download and remove a book
|
* Test that we can successfully download and remove a book
|
||||||
|
Loading…
Reference in New Issue
Block a user