1 files changed, 29 insertions, 26 deletions
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 26fe186..caf1761 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
@@ -34,7 +34,7 @@ public class CommonActivity extends AppCompatActivity {
 
 	protected final static int REQUEST_SHARE = 1;
 	protected static final int REQUEST_VIEWCOMIC = 2;
-	protected static final int REQUEST_PERMISSION_READ_EXTERNAL_STORAGE = 3;
+	protected static final int REQUEST_PERMISSIONS_RESULT = 3;
 
 	public static final long MAX_CACHE_SIZE = 100 * 1024 * 1024; // bytes
 
@@ -66,37 +66,40 @@ public class CommonActivity extends AppCompatActivity {
         }
 
         m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-    	
-    	initSync();
+
 	}
 	
 	@Override
 	public void onResume() {
 		super.onResume();
+	}
 
-		initSync();		
+	public boolean isSyncEnabled() {
+		return m_prefs.getBoolean("use_position_sync", false);
 	}
-	
-	private void initSync() {
-    	if (m_prefs.getBoolean("use_position_sync", false)) {
-        	String googleAccount = getGoogleAccount(this);
-        	
-	    	if (googleAccount != null) {
-	    		m_syncClient.setOwner(googleAccount);    			
-	    	} else {
-	    		if (BuildConfig.DEBUG) {
-		    		m_syncClient.setOwner("TEST-ACCOUNT");	    			
-		    		
-		    		//toast(R.string.sync_running_in_test_mode);
-	    		} else {
-	    			m_syncClient.setOwner(null);
-	    			toast(R.string.error_sync_no_account);
-	    			    		
-	    			SharedPreferences.Editor editor = m_prefs.edit();
-	    			editor.putBoolean("use_position_sync", false);
-	    			editor.apply();
-	    		}
-	    	}
+
+	protected void initSyncClient() {
+    	if (isSyncEnabled()) {
+
+			String googleAccount = getGoogleAccount(this);
+
+			if (googleAccount != null) {
+				m_syncClient.setOwner(googleAccount);
+			} else {
+				if (BuildConfig.DEBUG) {
+					m_syncClient.setOwner("TEST-ACCOUNT");
+
+					//toast(R.string.sync_running_in_test_mode);
+				} else {
+					m_syncClient.setOwner(null);
+					toast(R.string.error_sync_no_account);
+
+					SharedPreferences.Editor editor = m_prefs.edit();
+					editor.putBoolean("use_position_sync", false);
+					editor.apply();
+				}
+			}
+
     	} else {
     		m_syncClient.setOwner(null);
     	}
@@ -107,7 +110,7 @@ public class CommonActivity extends AppCompatActivity {
 	}
 
 
-    public void onComicSelected(String fileName, int position) {
+	public void onComicSelected(String fileName, int position) {
     	m_databaseHelper.setLastPosition(fileName, position);
     }