code simplification: openInBrowser is now a static method in Util; sms account refilling (in progress)

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

@@ -442,7 +442,7 @@ class NetworkBookActions extends NetworkTreeActions {
 	private static void doBuyInBrowser(Activity activity, final NetworkBookItem book) {
 		BookReference reference = book.reference(BookReference.Type.BUY_IN_BROWSER);
 		if (reference != null) {
-			NetworkView.Instance().openInBrowser(activity, reference.URL);
+			Util.openInBrowser(activity, reference.URL);
 		}
 	}
 

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

@@ -238,7 +238,7 @@ class NetworkCatalogActions extends NetworkTreeActions {
 				doExpandCatalog(activity, (NetworkCatalogTree)tree);
 				return true;
 			case OPEN_IN_BROWSER_ITEM_ID:
-				NetworkView.Instance().openInBrowser(
+				Util.openInBrowser(
 					activity,
 					((NetworkCatalogTree)tree).Item.URLByType.get(NetworkCatalogItem.URL_HTML_PAGE)
 				);
@@ -256,7 +256,7 @@ class NetworkCatalogActions extends NetworkTreeActions {
 				doSignOut(activity, (NetworkCatalogTree)tree);
 				return true;
 			case REFILL_ACCOUNT_ITEM_ID:
-				NetworkView.Instance().openInBrowser(
+				Util.openInBrowser(
 					activity,
 					((NetworkCatalogTree)tree).Item.Link.authenticationManager().refillAccountLink()
 				);

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

@@ -191,17 +191,6 @@ class NetworkView {
 		}
 	}
 
-	/*
-	 * Open Network URL in browser
-	 */
-
-	public void openInBrowser(Context context, String url) {
-		if (url != null) {
-			url = NetworkLibrary.Instance().rewriteUrl(url, true);
-			context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
-		}
-	}
-
 
 	/*
 	 * Notifying view's components from services

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

@@ -82,32 +82,52 @@ class RefillAccountActions extends NetworkTreeActions {
 
 	@Override
 	public boolean runAction(NetworkBaseActivity activity, NetworkTree tree, int actionCode) {
+		final INetworkLink link = ((RefillAccountTree)tree).Link;
+		Runnable refillRunnable = null;
 		switch (actionCode) {
 			case REFILL_VIA_SMS_ITEM_ID:
-				//doRefill(activity, (RefillAccountTree) tree);
+				refillRunnable = smsRefillRunnable(activity, link);
-				return true;
+				break;
 			case REFILL_VIA_BROWSER_ITEM_ID:
-				doRefill(activity, (RefillAccountTree) tree);
+				refillRunnable = browserRefillRunnable(activity, link);
-				return true;
+				break;
 		}
-		return false;
+
+		if (refillRunnable == null) {
+			return false;
+		}
+		doRefill(activity, link, refillRunnable);
+		return true;
 	}
 
-	private void doRefill(final NetworkBaseActivity activity, final RefillAccountTree tree) {
+	private Runnable browserRefillRunnable(final NetworkBaseActivity activity, final INetworkLink link) {
-		final NetworkAuthenticationManager mgr = tree.Link.authenticationManager();
+		return new Runnable() {
+			public void run() {
+				Util.openInBrowser(
+					activity,
+					link.authenticationManager().refillAccountLink()
+				);
+			}
+		};
+	}
+
+	private Runnable smsRefillRunnable(final NetworkBaseActivity activity, final INetworkLink link) {
+		return new Runnable() {
+			public void run() {
+				// TODO: implement
+			}
+		};
+	}
+
+	private void doRefill(final NetworkBaseActivity activity, final INetworkLink link, final Runnable refiller) {
+		final NetworkAuthenticationManager mgr = link.authenticationManager();
 		if (mgr.mayBeAuthorised(false)) {
-			NetworkView.Instance().openInBrowser(
+			refiller.run();
-				activity,
-				tree.Link.authenticationManager().refillAccountLink()
-			);
 		} else {
-			NetworkDialog.show(activity, NetworkDialog.DIALOG_AUTHENTICATION, tree.Link, new Runnable() {
+			NetworkDialog.show(activity, NetworkDialog.DIALOG_AUTHENTICATION, link, new Runnable() {
 				public void run() {
 					if (mgr.mayBeAuthorised(false)) {
-						NetworkView.Instance().openInBrowser(
+						refiller.run();
-							activity,
-							tree.Link.authenticationManager().refillAccountLink()
-						);
 					}
 				}
 			});

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

@@ -22,10 +22,12 @@ package org.geometerplus.android.fbreader.network;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.content.Context;
 import android.net.Uri;
 
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
+import org.geometerplus.fbreader.network.NetworkLibrary;
 import org.geometerplus.fbreader.network.INetworkLink;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 
@@ -90,4 +92,11 @@ abstract class Util implements UserRegistrationConstants {
 	static boolean isBrowserAccountRefillingSupported(Activity activity, INetworkLink link) {
 		return link.getLink(INetworkLink.URL_REFILL_ACCOUNT) != null;
 	}
+
+	static void openInBrowser(Context context, String url) {
+		if (url != null) {
+			url = NetworkLibrary.Instance().rewriteUrl(url, true);
+			context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+		}
+	}
 }

src/org/geometerplus/fbreader/formats/FormatPlugin.java

@@ -36,7 +36,7 @@ public abstract class FormatPlugin {
 		String language = book.getLanguage();
 		String encoding = book.getEncoding();
 		if (encoding.length() == 0 || language.length() == 0) {
-			PluginCollection collection = PluginCollection.instance();
+			PluginCollection collection = PluginCollection.Instance();
 			if (language.length() == 0) {
 				language = collection.DefaultLanguageOption.getValue();
 			}
@@ -67,7 +67,7 @@ public abstract class FormatPlugin {
 	public static void detectEncodingAndLanguage(Book book, InputStream stream) {	
 		String encoding = book.getEncoding();
 		if (encoding.length() == 0) {
-			encoding = EncodingDetector.detect(stream, PluginCollection.instance().DefaultLanguageOption.getValue());
+			encoding = EncodingDetector.detect(stream, PluginCollection.Instance().DefaultLanguageOption.getValue());
 			if (encoding == "unknown") {
 				encoding = "windows-1252";
 			}
@@ -84,7 +84,7 @@ public abstract class FormatPlugin {
 					(encoding.equals("IBM866"))) {
 				book.setLanguage("ru");
 			} /*else if (
-	                (PluginCollection.instance().DefaultLanguageOption.getValue() == EncodingDetector.Language.CZECH) &&
+	                (PluginCollection.Instance().DefaultLanguageOption.getValue() == EncodingDetector.Language.CZECH) &&
 					((encoding == "windows-1250") ||
 					 (encoding == "ISO-8859-2") ||
 					 (encoding == "IBM852"))) {