From eded1868fa3c8b78b18df75be61984a037a0cb67 Mon Sep 17 00:00:00 2001
From: Thomas Taschauer <tomtasche@gmail.com>
Date: Mon, 14 Oct 2013 22:12:53 +0200
Subject: [PATCH] restrict access to editing-feature, bump version

---
 AndroidManifest.xml                                   | 4 ++--
 odf2html                                              | 2 +-
 src/at/tomtasche/reader/ui/activity/MainActivity.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 12b419f34313..3c43ba38c1d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.tomtasche.reader"
     android:installLocation="auto"
-    android:versionCode="55"
-    android:versionName="2.12.2" >
+    android:versionCode="57"
+    android:versionName="2.12.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/odf2html b/odf2html
index 5671add48b0b..a28c9f04c102 160000
--- a/odf2html
+++ b/odf2html
@@ -1 +1 @@
-Subproject commit 5671add48b0b2fa9c1dead220f7c5144a853c6a2
+Subproject commit a28c9f04c102f97e63b29e7cdc53cd193a574957
diff --git a/src/at/tomtasche/reader/ui/activity/MainActivity.java b/src/at/tomtasche/reader/ui/activity/MainActivity.java
index e6bab89a6829..00726f739117 100644
--- a/src/at/tomtasche/reader/ui/activity/MainActivity.java
+++ b/src/at/tomtasche/reader/ui/activity/MainActivity.java
@@ -544,7 +544,7 @@ public void run() {
 			analytics.sendEvent("ui", "google+", null, null);
 		}
 		case R.id.menu_edit: {
-			if (!showAds) {
+			if (hasEditing) {
 				EditActionModeCallback editActionMode = new EditActionModeCallback(
 						this, getPageFragment().getPageView(), getDocument()
 								.getOrigin());