[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit e3a4316f018bc55fb2e9ba374b3b7ae9b2b7c178
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Jan 16 16:02:38 2015 +0900

    android: remove invalidation registration on touch for now
    
    Change-Id: I7b3acba83de0c17bd4723fb6623827dbbb82fbbf

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index ed89536..32cb43c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -22,7 +22,6 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation
     private TileProvider mTileProvider;
     private ImmutableViewportMetrics mViewportMetrics;
     private GeckoLayerClient mLayerClient;
-    private boolean mInvalidationCallbackRegistered = false;
 
     public LOKitThread() {
         TileProviderFactory.initialize();
@@ -99,9 +98,9 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation
         boolean isReady = mTileProvider.isReady();
         if (isReady) {
             LOKitShell.showProgressSpinner();
+            mTileProvider.registerInvalidationCallback(this);
             refresh();
             LOKitShell.hideProgressSpinner();
-            mInvalidationCallbackRegistered = false;
         }
         return isReady;
     }
@@ -153,10 +152,6 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation
 
     private void touch(String touchType, MotionEvent motionEvent) {
         LibreOfficeMainActivity.mAppContext.showSoftKeyboard();
-        if (!mInvalidationCallbackRegistered) {
-            mTileProvider.registerInvalidationCallback(this);
-            mInvalidationCallbackRegistered = true;
-        }
     }
 
     private void createThumbnail(final ThumbnailCreator.ThumbnailCreationTask task) {