Merge branch 'master' into library

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java

assets/resources/application/cs.xml

@@ -65,6 +65,7 @@
 			<node name="refillAccount" value="Doplnit účet"/>
 			<node name="addCustomCatalog" value="Přidat katalog"/>
 			<node name="refreshCatalogsList" value="Aktualizovat katalogy"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/de.xml

@@ -66,6 +66,7 @@
 			<node name="refillAccount" value="Konto aufladen"/>
 			<node name="addCustomCatalog" value="Katalog hinzufügen"/>
 			<node name="refreshCatalogsList" value="Liste der Kataloge aktualisieren"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/fr.xml

@@ -68,6 +68,7 @@
 			<node name="refillAccount" value="Recréditer le compte"/>
 			<node name="addCustomCatalog" value="Ajouter catalogue"/>
 			<node name="refreshCatalogsList" value="Rafraîchir"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">
@@ -277,8 +278,6 @@
 				</node>
 			</node>
 		</node>
-		<node name="Preferences">
-		</node>
 		<node name="OptionsDialog">
 			<node name="title" value="FBReader - Options"/>
 			<node name="tab">

assets/resources/application/hu.xml

@@ -65,6 +65,7 @@
 			<node name="refillAccount" value="Számla feltöltése"/>
 			<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
 			<node name="refreshCatalogsList" toBeTranslated="true" value="Refresh catalogs"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/it.xml

@@ -65,6 +65,7 @@
 			<node name="refillAccount" value="Ricarica account"/>
 			<node name="addCustomCatalog" value="Aggiungi catalogo"/>
 			<node name="refreshCatalogsList" toBeTranslated="true" value="Refresh catalogs"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/ru.xml

@@ -64,6 +64,7 @@
 			<node name="refillAccount" value="Пополнить счёт"/>
 			<node name="addCustomCatalog" value="Добавить каталог"/>
 			<node name="refreshCatalogsList" value="Обновить каталоги"/>
+			<node name="languages" value="Фильтр по языку"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/uk.xml

@@ -65,6 +65,7 @@
 			<node name="refillAccount" value="Поповнити рахунок"/>
 			<node name="addCustomCatalog" value="Додати каталог"/>
 			<node name="refreshCatalogsList" value="Оновити каталоги"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/vi.xml

@@ -65,6 +65,7 @@
 			<node name="refillAccount" value="Tái đầy tài khoản "/>
 			<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
 			<node name="refreshCatalogsList" toBeTranslated="true" value="Refresh catalogs"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

assets/resources/application/zh.xml

@@ -65,6 +65,7 @@
 			<node name="refillAccount" toBeTranslated="true" value="Refill account"/>
 			<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
 			<node name="refreshCatalogsList" toBeTranslated="true" value="Refresh catalogs"/>
+			<node name="languages" toBeTranslated="true" value="Language filter"/>
 		</node>
 	</node>
 	<node name="networkBookView">

src/org/geometerplus/android/fbreader/FBReader.java

@@ -37,7 +37,6 @@ import org.geometerplus.zlibrary.core.application.ZLApplication;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.view.ZLView;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
-import org.geometerplus.zlibrary.text.model.ZLTextModel;
 import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
 import org.geometerplus.zlibrary.text.view.ZLTextPosition;
 import org.geometerplus.zlibrary.text.view.ZLTextView;
@@ -45,7 +44,6 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidActivity;
 import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
 import org.geometerplus.zlibrary.ui.android.R;
 
-import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.fbreader.FBReaderApp;
 import org.geometerplus.fbreader.fbreader.ActionCode;
 import org.geometerplus.fbreader.library.Library;
@@ -101,22 +99,6 @@ public final class FBReader extends ZLAndroidActivity {
 	@Override
 	protected ZLFile fileFromIntent(Intent intent) {
 		String fileToOpen = intent.getStringExtra(BOOK_PATH_KEY);
-		/*
-		if (fileToOpen == null && Intent.ACTION_VIEW.equals(intent.getAction())) {
-			final Uri uri = intent.getData();
-			if (uri != null) {
-				fileToOpen = fileNameFromUri(uri);
-				final String scheme = uri.getScheme();
-				if ("content".equals(scheme)) {
-					final File file = new File(fileToOpen);
-					if (!file.exists()) {
-						fileToOpen = file.getParent();
-					}
-				}
-			}
-			intent.setData(null);
-		}
-		*/
 		return fileToOpen != null ? ZLFile.createFileByPath(fileToOpen) : null;
 	}
 

src/org/geometerplus/android/fbreader/LibraryTabActivity.java

@@ -39,8 +39,6 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.fbreader.library.*;
 import org.geometerplus.fbreader.tree.FBTree;
 
-import org.geometerplus.android.util.AndroidUtil;
-
 public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuItemClickListener {
 	public static final String CURRENT_BOOK_PATH_KEY = "CurrentBookPath";
 

src/org/geometerplus/android/fbreader/ShowLibraryAction.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.android.fbreader;
 
-import java.util.HashMap;
-
 import android.content.Intent;
 
 import org.geometerplus.fbreader.fbreader.FBAction;

src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java

@@ -42,7 +42,6 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
 import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;
 import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;
 import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
-import org.geometerplus.zlibrary.ui.android.R;
 
 import org.geometerplus.fbreader.network.NetworkTree;
 import org.geometerplus.fbreader.network.NetworkImage;

src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java

@@ -30,7 +30,6 @@ import android.widget.BaseAdapter;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
-import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
 
 import org.geometerplus.zlibrary.ui.android.R;
 

src/org/geometerplus/android/fbreader/preferences/BatteryLevelToTurnScreenOffPreference.java

@@ -20,7 +20,6 @@
 package org.geometerplus.android.fbreader.preferences;
 
 import android.content.Context;
-import android.preference.ListPreference;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;

src/org/geometerplus/fbreader/network/NetworkLibrary.java

@@ -100,7 +100,6 @@ public class NetworkLibrary {
 		if (myIsAlreadyInitialized) {
 			return;
 		}
-		final LinksComparator comparator = new LinksComparator(); 
 
 		try {
 			OPDSLinkReader.loadOPDSLinks(OPDSLinkReader.CACHE_LOAD, new OnNewLinkListener() {
@@ -466,6 +465,6 @@ public class NetworkLibrary {
 		for (INetworkLink link : myLinks) {
 			languageSet.add(link.getLanguage());
 		}
-		return new ArrayList(languageSet);
+		return new ArrayList<String>(languageSet);
 	}
 }

src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.fbreader.optionsDialog;
 
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.dialogs.*;
 import org.geometerplus.zlibrary.core.optionEntries.*;
 import org.geometerplus.zlibrary.core.resources.ZLResource;

src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java

@@ -20,7 +20,6 @@
 package org.geometerplus.fbreader.optionsDialog;
 
 import org.geometerplus.zlibrary.core.dialogs.ZLDialogContent;
-import org.geometerplus.zlibrary.core.optionEntries.ZLFontFamilyOptionEntry;
 import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry;
 import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -37,7 +36,7 @@ public class StyleOptionsPage extends OptionsPage implements FBTextKind {
 	private final static String KEY_BOLD = "bold";
 	private final static String KEY_ITALIC = "italic";
 	private final static String KEY_FONTFAMILY = "fontFamily";
-	private final static String KEY_FONTSIZE = "fontSize";
+	//private final static String KEY_FONTSIZE = "fontSize";
 	private final static String KEY_FONTSIZEDIFFERENCE = "fontSizeDifference";
 	private final static String KEY_ALLOWHYPHENATIONS = "allowHyphenations";
 	

src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java

@@ -22,7 +22,6 @@ package org.geometerplus.zlibrary.core.dialogs;
 import java.util.*;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.core.options.*;
 
 public abstract class ZLDialogContent {
 	private final ZLResource myResource;

src/org/geometerplus/zlibrary/core/library/ZLibrary.java

@@ -20,7 +20,6 @@
 package org.geometerplus.zlibrary.core.library;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
-import org.geometerplus.zlibrary.core.view.ZLPaintContext;
 
 public abstract class ZLibrary {
 	public static ZLibrary Instance() {

src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java

@@ -43,7 +43,6 @@ public class ZLFontFamilyOptionEntry extends ZLComboOptionEntry {
 	}
 
 	public String initialValue() {
-		final ArrayList<String> allValues = getValues();
 		final String value = myOption.getValue();
 		for (String v : getValues()) {
 			if (value.equals(myContext.realFontFamilyName(v))) {

src/org/geometerplus/zlibrary/core/util/ZLTTFInfoDetector.java

@@ -107,20 +107,20 @@ public class ZLTTFInfoDetector {
 
 	private static class TableInfo {
 		final String Name;
-		final int CheckSum;
+		//final int CheckSum;
 		final int Offset;
 		final int Length;
 
 		TableInfo(byte[] buffer, int off) throws IOException {
 			Name = new String(buffer, off, 4, "ascii");
-			CheckSum = getInt32(buffer, off + 4);
+			//CheckSum = getInt32(buffer, off + 4);
 			Offset = getInt32(buffer, off + 8);
 			Length = getInt32(buffer, off + 12);
 		}
 
-		void print(PrintStream writer) {
+		/*void print(PrintStream writer) {
 			writer.println(Name + " : " + Offset + " : " + Length + " : " + CheckSum);
-		}
+		}*/
 	}
 
 	byte[] readTable(TableInfo info) throws IOException {
@@ -190,7 +190,7 @@ public class ZLTTFInfoDetector {
 		return fontInfo;
 	}
 
-	private int readFontProperties(TableInfo fdscInfo) throws IOException {
+	/*private int readFontProperties(TableInfo fdscInfo) throws IOException {
 		if (fdscInfo == null || fdscInfo.Offset < myPosition || fdscInfo.Length <= 16) {
 			return 0;
 		}
@@ -198,5 +198,5 @@ public class ZLTTFInfoDetector {
 		System.err.println(getInt32(buffer, 0));
 		System.err.println(getInt32(buffer, 4));
 		return 0;
-	}
+	}*/
 }

src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java

@@ -19,10 +19,7 @@
 
 package org.geometerplus.zlibrary.ui.android.dialogs;
 
-import java.util.*;
-
 import android.app.*;
-import android.content.*;
 
 import org.geometerplus.zlibrary.core.dialogs.*;
 

src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java

@@ -22,8 +22,6 @@ package org.geometerplus.zlibrary.ui.android.dialogs;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.view.*;
-import android.widget.*;
 
 import org.geometerplus.zlibrary.core.dialogs.*;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -31,12 +29,12 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
 
 class ZLAndroidOptionsDialog extends ZLOptionsDialog {
-	private final String myCaption;
+	//private final String myCaption;
 	private final Activity myMainActivity;
 
 	ZLAndroidOptionsDialog(Activity activity, ZLResource resource) {
 		super(resource);
-		myCaption = resource.getResource("title").getValue();
+		//myCaption = resource.getResource("title").getValue();
 		myMainActivity = activity;
 	}
 

src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java

@@ -206,8 +206,11 @@ public abstract class ZLAndroidActivity extends Activity {
 	@Override
 	public void onNewIntent(Intent intent) {
 		super.onNewIntent(intent);
-		ZLApplication.Instance().openFile(fileFromIntent(intent));
+
-		ZLApplication.Instance().repaintView();
+		final String fileToOpen = extractFileNameFromIntent(intent);
+		if (fileToOpen != null) {
+			ZLApplication.Instance().openFile(ZLFile.createFileByPath(fileToOpen));
+		}
 	}
 
 	private static ZLAndroidLibrary getLibrary() {

src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java

@@ -23,7 +23,6 @@ import java.io.*;
 import java.util.*;
 
 import android.app.Application;
-import android.content.res.Resources;
 import android.content.res.AssetFileDescriptor;
 import android.content.Intent;
 import android.net.Uri;

src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java

@@ -27,7 +27,6 @@ import java.lang.reflect.InvocationTargetException;
 
 import android.graphics.Typeface;
 
-import org.geometerplus.zlibrary.core.util.ZLTTFInfo;
 import org.geometerplus.zlibrary.core.util.ZLTTFInfoDetector;
 
 import org.geometerplus.fbreader.Paths;

src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java

@@ -26,8 +26,6 @@ import android.graphics.*;
 
 import org.geometerplus.zlibrary.core.image.ZLImageData;
 import org.geometerplus.zlibrary.core.util.ZLColor;
-import org.geometerplus.zlibrary.core.util.ZLTTFInfo;
-import org.geometerplus.zlibrary.core.util.ZLTTFInfoDetector;
 import org.geometerplus.zlibrary.core.view.ZLPaintContext;
 
 import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;