Skip to content

Commit 184a18c

Browse files
committed
fixed ms word files visibility => 1.6.1
1 parent 306db3a commit 184a18c

6 files changed

Lines changed: 14 additions & 6 deletions

File tree

‎AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="106001" android:versionName="1.6" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="106011" android:versionName="1.6.1" android:installLocation="auto">
33
<uses-sdk android:minSdkVersion="5" android:maxSdkVersion="10"/>
44
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
55
<uses-permission android:name="android.permission.INTERNET"/>

‎ChangeLog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
===== 1.6.0 (Oct 06, 2012) =====
1+
===== 1.6.0/1.6.1 (Oct 06, 2012) =====
22
* MS Word (.doc) format support
33
* Fixed library duplicates issue
44
* Library speed optimization

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6
1+
1.6.1

‎jni/NativeFormats/fbreader/src/formats/doc/DocPlugin.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
* 02110-1301, USA.
1818
*/
1919

20-
#include <iostream>
21-
2220
#include <ZLFile.h>
2321
#include <ZLInputStream.h>
2422
#include <ZLLogger.h>
@@ -41,7 +39,7 @@ bool DocPlugin::providesMetaInfo() const {
4139
}
4240

4341
const std::string DocPlugin::supportedFileType() const {
44-
return "doc";
42+
return "MS Word document";
4543
}
4644

4745
bool DocPlugin::acceptsFile(const ZLFile &file) const {

‎src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,9 @@ public Type type() {
110110
public EncodingCollection supportedEncodings() {
111111
return JavaEncodingCollection.Instance();
112112
}
113+
114+
@Override
115+
public String toString() {
116+
return "NativeFormatPlugin [" + supportedFileType() + "]";
117+
}
113118
}

‎src/org/geometerplus/zlibrary/core/filetypes/SimpleFileType.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ public List<MimeType> mimeTypes() {
5555
public MimeType mimeType(ZLFile file) {
5656
return acceptsFile(file) ? myMimeTypes.get(0) : MimeType.NULL;
5757
}
58+
59+
@Override
60+
public String toString() {
61+
return "SimpleFileType [" + Id + "]";
62+
}
5863
}

0 commit comments

Comments
 (0)