make sure bridge actually works, duh

9 files changed, 39 insertions, 19 deletions

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 29745a8..f080d5f 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'

     compile 'frankiesardo:icepick:3.2.0'

     provided 'frankiesardo:icepick-processor:3.2.0'

-    compile 'com.github.livefront:bridge:v1.1.1'

+    compile 'com.github.livefront:bridge:v1.1.2'

     annotationProcessor 'frankiesardo:icepick-processor:3.2.0'

     compile 'com.google.android.gms:play-services-base:15.0.1'

     compile 'com.google.android.gms:play-services-auth:15.0.1'

diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index 2a5a171..e5494e2 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -150,7 +150,7 @@
     <orderEntry type="library" name="slingshot:slingshot:0.10.3@jar" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-27.1.0" level="project" />
-    <orderEntry type="library" name="com.github.livefront:bridge-v1.1.1" level="project" />
+    <orderEntry type="library" name="com.github.livefront:bridge-v1.1.2" level="project" />
     <orderEntry type="library" name="com.google.auto:auto-common:0.3@jar" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-media-compat-27.1.0" level="project" />
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 6006840..7e2655b 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET" />

     

     <application

-	android:name="org.fox.ttcomics2.Application"

+	    android:name=".Application"

         android:icon="@drawable/ic_launcher"

         android:label="@string/app_name"

         android:hardwareAccelerated="true"

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
index 1e9091c..848600f 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
@@ -14,7 +14,7 @@ import org.acra.annotation.ReportsCrashes;
 import icepick.Icepick;
 
 @ReportsCrashes(mode = ReportingInteractionMode.SILENT,
-        excludeMatchingSharedPreferencesKeys = {"password"},
+        excludeMatchingSharedPreferencesKeys = {"password", "sync_account"},
         resDialogText = R.string.crash_dialog_text,
         formUri = "https://tt-rss.org/acra/submit/")
 public class Application extends android.app.Application {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
index a514bd0..4121dfd 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.SharedPreferences;

 import android.os.Bundle;

 import android.preference.PreferenceManager;

-import android.support.v4.app.Fragment;

 import android.support.v7.app.ActionBar;

 import android.view.GestureDetector;

 import android.view.LayoutInflater;

@@ -23,7 +22,7 @@ import java.io.IOException;
 import icepick.State;

 import it.sephiroth.android.library.imagezoom.ImageViewTouch;

 

-public class ComicFragment extends Fragment implements GestureDetector.OnDoubleTapListener {

+public class ComicFragment extends StateSavedFragment implements GestureDetector.OnDoubleTapListener {

 	private final String TAG = this.getClass().getSimpleName();

 	

 	private SharedPreferences m_prefs;

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
index 1b8ff04..8c7f8ac 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
@@ -8,7 +8,6 @@ import android.graphics.Bitmap;
 import android.os.Bundle;

 import android.preference.PreferenceManager;

 import android.provider.BaseColumns;

-import android.support.v4.app.Fragment;

 import android.support.v4.widget.SimpleCursorAdapter;

 import android.support.v4.widget.SwipeRefreshLayout;

 import android.util.Log;

@@ -39,7 +38,7 @@ import java.io.File;
 import icepick.State;

 import jp.co.recruit_mp.android.widget.HeaderFooterGridView;

 

-public class ComicListFragment extends Fragment implements OnItemClickListener {

+public class ComicListFragment extends StateSavedFragment implements OnItemClickListener {

 	private final String TAG = this.getClass().getSimpleName();

 

 	protected final static int SIZE_DIR = -100;

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 7db1753..5599c64 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
@@ -13,6 +13,7 @@ import android.util.Log;
 import android.view.MenuItem;

 import android.view.View;

 

+import com.livefront.bridge.Bridge;

 import com.nostra13.universalimageloader.core.DisplayImageOptions;

 import com.nostra13.universalimageloader.core.ImageLoader;

 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;

@@ -36,7 +37,7 @@ public class CommonActivity extends AppCompatActivity {
 	protected static final int REQUEST_PERMISSIONS_RESULT = 3;

 	protected static final int REQUEST_SYNC_ACCOUNT = 4;

 

-	public static final String PRIVACY_POLICY_URL = "https://tt-rss.org/gitlab/fox/tt-comics/wikis/PrivacyPolicy";

+	public static final String PRIVACY_POLICY_URL = "https://git.tt-rss.org/fox/tt-comics/wiki/PrivacyPolicy";

 

 	public static final long MAX_CACHE_SIZE = 100 * 1024 * 1024; // bytes

 

@@ -49,6 +50,8 @@ public class CommonActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);

 

+		Bridge.restoreInstanceState(this, savedInstanceState);

+

 		m_databaseHelper = DatabaseHelper.getInstance(this);

 

 		if (!ImageLoader.getInstance().isInited()) {

@@ -68,7 +71,6 @@ public class CommonActivity extends AppCompatActivity {
         }

 

         m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

-

 	}

 	

 	@Override

@@ -87,8 +89,6 @@ public class CommonActivity extends AppCompatActivity {
 

 			String syncAccount = getSyncAccount(this);

 

-			Log.d(TAG, "sync account=" + syncAccount);

-

 			if (syncAccount != null) {

 				m_syncClient.setOwner(syncAccount);

 			} else {

@@ -110,8 +110,6 @@ public class CommonActivity extends AppCompatActivity {
 	protected void onActivityResult(final int requestCode, final int resultCode,

 									final Intent data) {

 

-		Log.d(TAG, "RQ=" + requestCode);

-

 		if (requestCode == REQUEST_SYNC_ACCOUNT && resultCode == RESULT_OK) {

 			String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);

 

@@ -121,11 +119,16 @@ public class CommonActivity extends AppCompatActivity {
 		}

 	}

 

+	@Override

+	public void onSaveInstanceState(Bundle out) {

+		super.onSaveInstanceState(out);

+		Bridge.saveInstanceState(this, out);

+	}

+

 	public void onComicArchiveSelected(String fileName) {

 		//

 	}

 

-

 	public void onComicSelected(String fileName, int position) {

     	m_databaseHelper.setLastPosition(fileName, position);

     }

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
index 245ad2c..746c54b 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.MenuItem;
 
 public class PreferencesActivity extends CommonActivity {
@@ -43,9 +42,7 @@ public class PreferencesActivity extends CommonActivity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-	    Log.d("123", "RQ2=" + requestCode);
-
-        if(requestCode == DirectoryPicker.PICK_DIRECTORY && resultCode == RESULT_OK) {
+        if (requestCode == DirectoryPicker.PICK_DIRECTORY && resultCode == RESULT_OK) {
             Bundle extras = data.getExtras();
             String path = (String) extras.get(DirectoryPicker.CHOSEN_DIRECTORY);
 
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java
new file mode 100755
index 0000000..023c3dc
--- /dev/null
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java
@@ -0,0 +1,22 @@
+package org.fox.ttcomics2;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+
+import com.livefront.bridge.Bridge;
+
+public class StateSavedFragment extends Fragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bridge.restoreInstanceState(this, savedInstanceState);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle out) {
+        super.onSaveInstanceState(out);
+
+        Bridge.saveInstanceState(this, out);
+    }
+}