yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into library-service

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
This commit is contained in:
Nikolay Pultsin 2013-02-05 09:15:01 +00:00
commit c4308ade41
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
View file

@ -19,8 +19,7 @@
package org.geometerplus.android.fbreader.libraryService; package org.geometerplus.android.fbreader.libraryService;
import java.util.Collections; import java.util.*;
import java.util.List;
import android.content.*; import android.content.*;
import android.os.IBinder; import android.os.IBinder;

4
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
View file

@ -19,8 +19,7 @@
package org.geometerplus.android.fbreader.libraryService; package org.geometerplus.android.fbreader.libraryService;
import java.util.List; import java.util.*;
import java.util.LinkedList;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
@ -160,6 +159,7 @@ public class LibraryService extends Service {
.toString() .toString()
); );
} }
return strings;
} }
public boolean saveBook(String book, boolean force) { public boolean saveBook(String book, boolean force) {