Nikolay Pultsin
|
3cb970e4cd
|
myFBReaderApp field
|
2013-01-20 03:16:02 +04:00 |
|
Nikolay Pultsin
|
7bce953046
|
FBReader.ACTION_OPEN_BOOK
|
2013-01-20 03:05:16 +04:00 |
|
Nikolay Pultsin
|
53c146e532
|
fixed book opening
|
2013-01-20 02:39:31 +04:00 |
|
Nikolay Pultsin
|
f56ccb5307
|
Merge branch 'master' into library-service
|
2013-01-20 01:05:21 +04:00 |
|
Nikolay Pultsin
|
d2d268a046
|
ZLAndroidActivity has gone
|
2013-01-20 00:51:07 +04:00 |
|
Nikolay Pultsin
|
5e1aa208dc
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
|
2013-01-20 00:30:25 +04:00 |
|
Nikolay Pultsin
|
896316b023
|
empty ZLAndroidActivity
|
2013-01-20 00:17:20 +04:00 |
|
Nikolay Pultsin
|
71342597d7
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
|
2013-01-19 23:52:16 +04:00 |
|
Nikolay Pultsin
|
5f428e149a
|
more methods moved from ZLAndroidActivity to FBReader
|
2013-01-19 22:59:46 +04:00 |
|
Nikolay Pultsin
|
9f7c945f2b
|
Merge branch 'master' into library-service
|
2013-01-19 22:39:52 +04:00 |
|
Nikolay Pultsin
|
8d227b4400
|
formatting
|
2013-01-19 22:38:59 +04:00 |
|
Nikolay Pultsin
|
3e2f6bbef8
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
|
2013-01-19 22:37:51 +04:00 |
|
Nikolay Pultsin
|
97293852d4
|
onKey{Down,Up} => FBReader
|
2013-01-19 22:34:14 +04:00 |
|
Nikolay Pultsin
|
1d00d8bd5e
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
|
2013-01-19 22:23:26 +04:00 |
|
Nikolay Pultsin
|
e4b0b64ffa
|
merge order
|
2013-01-19 22:00:44 +04:00 |
|
Nikolay Pultsin
|
86439a18d7
|
onCreate moved from ZLAndroidActivity to FBReader
|
2013-01-19 21:52:02 +04:00 |
|
Nikolay Pultsin
|
6b78cb1895
|
Merge branch 'master' into library-service
|
2013-01-19 21:07:04 +04:00 |
|
Nikolay Pultsin
|
2e3a9d8de3
|
unused constants
|
2013-01-19 21:05:35 +04:00 |
|
Nikolay Pultsin
|
9dcef30885
|
compilation issue
|
2013-01-19 21:05:09 +04:00 |
|
Nikolay Pultsin
|
e8b6c001ff
|
library initialization
Conflicts:
src/org/geometerplus/fbreader/book/BookCollection.java
|
2013-01-15 06:19:00 +04:00 |
|
Nikolay Pultsin
|
42a38f3ab9
|
LibraryActivity uses BookCollectionShadow
|
2013-01-15 05:51:41 +04:00 |
|
Nikolay Pultsin
|
b8d50dc537
|
KillerCallback has gone
|
2013-01-15 05:30:01 +04:00 |
|
Nikolay Pultsin
|
8736d24595
|
unused field
|
2013-01-15 05:27:15 +04:00 |
|
Nikolay Pultsin
|
c792a32ac8
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/AbstractBookCollection.java
src/org/geometerplus/fbreader/book/AbstractSerializer.java
src/org/geometerplus/fbreader/book/IBookCollection.java
|
2013-01-14 08:13:36 +04:00 |
|
Nikolay Pultsin
|
f725f70c03
|
files from library-service branch
|
2013-01-14 08:10:16 +04:00 |
|
Nikolay Pultsin
|
7d4b17b635
|
imports cleanup
|
2013-01-14 08:02:01 +04:00 |
|
Nikolay Pultsin
|
ccf95075ea
|
Merge branch 'master' into library-service
|
2013-01-14 08:00:37 +04:00 |
|
Nikolay Pultsin
|
351a105f67
|
toString() method optimization (?)
|
2013-01-14 08:00:06 +04:00 |
|
Nikolay Pultsin
|
949df7806c
|
Merge branch 'master' into library-service
|
2013-01-14 07:56:57 +04:00 |
|
Nikolay Pultsin
|
2c21956566
|
formatting
|
2013-01-14 07:56:44 +04:00 |
|
Nikolay Pultsin
|
3c61717c88
|
getEncoding(int) was not used in native code
|
2013-01-14 07:54:57 +04:00 |
|
Nikolay Pultsin
|
4bb8132427
|
public Collection field
|
2013-01-14 07:16:10 +04:00 |
|
Nikolay Pultsin
|
f95ad07f9e
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/BookUtil.java
src/org/geometerplus/fbreader/library/BookUtil.java
src/org/geometerplus/fbreader/library/LibraryUtil.java
|
2013-01-14 07:12:37 +04:00 |
|
Nikolay Pultsin
|
370e99c34a
|
LibraryUtil => BookUtil
|
2013-01-14 07:10:50 +04:00 |
|
Nikolay Pultsin
|
60fbf55a66
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/Book.java
src/org/geometerplus/fbreader/library/Library.java
|
2013-01-14 07:06:25 +04:00 |
|
Nikolay Pultsin
|
e588c37b3b
|
database parameter in FileInfoSet constructors
|
2013-01-14 07:05:09 +04:00 |
|
Nikolay Pultsin
|
5fcab45f82
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/library/Library.java
|
2013-01-14 06:23:40 +04:00 |
|
Nikolay Pultsin
|
d9b061117a
|
cleanup
|
2013-01-14 06:22:13 +04:00 |
|
Nikolay Pultsin
|
3ce7e10bf2
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/AbstractSerializer.java
|
2013-01-14 06:17:39 +04:00 |
|
Nikolay Pultsin
|
621c259a68
|
RunActivityAction has gone
|
2013-01-14 06:10:20 +04:00 |
|
Nikolay Pultsin
|
2b20e5d44a
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/ShowBookmarksAction.java
|
2013-01-14 06:01:26 +04:00 |
|
Nikolay Pultsin
|
eb59ff7ccb
|
synchronization with library-service branch
|
2013-01-14 06:00:37 +04:00 |
|
Nikolay Pultsin
|
0513e02a31
|
Merge branch 'master' into library-service
Conflicts:
jni/NativeFormats/util/AndroidUtil.cpp
|
2013-01-14 05:53:46 +04:00 |
|
Nikolay Pultsin
|
08d28f39dc
|
fixed package name
|
2013-01-14 05:52:14 +04:00 |
|
Nikolay Pultsin
|
b9e9cf3c45
|
fixed proguard package name
|
2013-01-14 05:51:30 +04:00 |
|
Nikolay Pultsin
|
9198de8ab8
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
|
2013-01-14 05:49:56 +04:00 |
|
Nikolay Pultsin
|
f172477537
|
SQLiteBooksDatabase moved to libraryService package
|
2013-01-14 05:43:07 +04:00 |
|
Nikolay Pultsin
|
3cccddbe07
|
Merge branch 'master' into library-service
|
2013-01-14 05:36:34 +04:00 |
|
Nikolay Pultsin
|
576a903da6
|
int constants => enum
|
2013-01-14 05:36:16 +04:00 |
|
Nikolay Pultsin
|
9664b59b56
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/Book.java
src/org/geometerplus/fbreader/library/Library.java
|
2013-01-14 05:22:10 +04:00 |
|