restart if sync settings changed

2 files changed, 12 insertions, 20 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 c81e80f..af79bdf 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -10,7 +10,6 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
@@ -247,9 +246,9 @@ public class CommonActivity extends AppCompatActivity {
 		
 		File file = new File(fileName);
 		
-		Cursor c = getReadableDb().query("comics_cache", new String[] { "position" },
+		Cursor c = getReadableDb().query("comics_cache", new String[]{"position"},
 				"filename = ? AND path = ?",
-				new String[] { file.getName(), file.getParentFile().getAbsolutePath() }, null, null, null);
+				new String[]{file.getName(), file.getParentFile().getAbsolutePath()}, null, null, null);
 
 		if (c.moveToFirst()) {
 			position = c.getInt(c.getColumnIndex("position"));
@@ -427,23 +426,6 @@ public class CommonActivity extends AppCompatActivity {
 		}
 	}
 
-	public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-	    // Raw height and width of image
-	    final int height = options.outHeight;
-	    final int width = options.outWidth;
-	    int inSampleSize = 1;
-	
-	    if (height > reqHeight || width > reqWidth) {
-	        if (width > height) {
-	            inSampleSize = Math.round((float)height / (float)reqHeight);
-	        } else {
-	            inSampleSize = Math.round((float)width / (float)reqWidth);
-	        }
-	    }
-	    return inSampleSize;
-	}
-	
-	
 	public void cleanupCache(boolean deleteAll) {
 		if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
 			File cachePath = getExternalCacheDir();
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index b230283..61f2b02 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -31,6 +31,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 	private int m_selectedTab;
 	private String m_rootDirectory = "";
     private MaterialTabHost tabHost;
+	private boolean m_useSync;
 
     @SuppressLint("NewApi")
 	@Override
@@ -38,6 +39,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
         super.onCreate(savedInstanceState);
 
 		m_rootDirectory = m_prefs.getString("comics_directory", "");
+		m_useSync = m_prefs.getBoolean("use_position_sync", false);
 
         setContentView(R.layout.activity_main);
 		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));
@@ -136,6 +138,14 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 			finish();
 			startActivity(getIntent());
 		}
+
+		if (m_useSync != m_prefs.getBoolean("use_position_sync", false)) {
+			Log.d(TAG, "sync settings changed, restarting");
+
+			finish();
+			startActivity(getIntent());
+
+		}
 	}
 
     @Override