From b3c9e0c2eba992e787aa9842ebef83d8981d4fd1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 31 Jul 2016 16:59:59 +0300
Subject: fix viewcomicactivity not initializing sync client unify handling of
 debug mode sync fallback sync reading progress every 10 pages

---
 org.fox.ttcomics/org.fox.ttcomics.iml                         |  7 +++++++
 org.fox.ttcomics/src/main/AndroidManifest.xml                 |  4 ++--
 .../src/main/java/org/fox/ttcomics2/CommonActivity.java       |  2 ++
 .../src/main/java/org/fox/ttcomics2/PreferencesFragment.java  |  6 ++++--
 .../src/main/java/org/fox/ttcomics2/ViewComicActivity.java    | 11 ++++++++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index 1448106..4d2fafa 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -77,6 +77,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -90,10 +91,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/it.neokree/MaterialTabs/0.11/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/jp.co.recruit_mp/android-HeaderFooterGridView/0.2.4/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 20e298d..ccf5d1a 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttcomics2"
-    android:versionCode="71"
-    android:versionName="1.29" >
+    android:versionCode="72"
+    android:versionName="1.30" >
 
     <uses-sdk
         android:minSdkVersion="19"
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index caf1761..2400d2e 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -79,6 +79,8 @@ public class CommonActivity extends AppCompatActivity {
 	}
 
 	protected void initSyncClient() {
+		Log.d(TAG, "initSynClient");
+
     	if (isSyncEnabled()) {
 
 			String googleAccount = getGoogleAccount(this);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
index aa6174b..da7887d 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
@@ -10,7 +10,6 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -99,8 +98,11 @@ public class PreferencesFragment extends PreferenceFragment {
                                 if (googleAccount != null) {
                                     m_syncClient.setOwner(googleAccount);
                                 } else {
-                                    if (Build.HARDWARE.equals("goldfish")) {
+                                    if (BuildConfig.DEBUG) {
                                         m_syncClient.setOwner("TEST-ACCOUNT");
+
+                                        //Toast toast = Toast.makeText(getActivity(), R.string.sync_running_in_test_mode, Toast.LENGTH_SHORT);
+                                        //toast.show();
                                     } else {
                                         m_syncClient.setOwner(null);
 
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
index d08dbd5..5699943 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
@@ -80,6 +80,8 @@ public class ViewComicActivity extends CommonActivity {
         
        	getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+		initSyncClient();
+
         setTitle(new File(m_fileName).getName());
     }
     
@@ -103,8 +105,15 @@ public class ViewComicActivity extends CommonActivity {
 	@Override
 	public void onComicSelected(String fileName, int position) {
 		super.onComicSelected(fileName, position);
+
+		Log.d(TAG, "onComicSelected: " + fileName + " " + position);
+
+		if ((position + 1) % 10 == 0 && m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) {
+			m_syncClient.setPosition(sha1(new File(fileName).getName()), m_databaseHelper.getLastPosition(fileName));
+		}
 	}
-	
+
+	@Override
 	public void onPause() {
 		super.onPause();
 		
-- 
cgit v1.2.3