diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/CommonActivity.java | 23 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/MainActivity.java | 7 |
3 files changed, 21 insertions, 11 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index cbb3db9..4682d43 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -43,4 +43,6 @@ <string name="error_no_comic_arhives_found_">No comic arhives found.</string>
<string name="prefs_use_position_sync">Sync last read page</string>
<string name="prefs_use_position_sync_summary">Requires at least one Google account on the device. No personally identifiable information is sent.</string>
+ <string name="error_sync_no_account">No Google account found, sync disabled.</string>
+ <string name="sync_uploading">Uploading sync data...</string>
</resources>
\ No newline at end of file diff --git a/src/org/fox/ttcomics/CommonActivity.java b/src/org/fox/ttcomics/CommonActivity.java index f4aa04d..e717774 100644 --- a/src/org/fox/ttcomics/CommonActivity.java +++ b/src/org/fox/ttcomics/CommonActivity.java @@ -40,14 +40,21 @@ public class CommonActivity extends FragmentActivity { super.onCreate(savedInstanceState);
m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-
- String googleAccount = getGoogleAccount();
-
- if (googleAccount != null) {
- m_syncClient.setOwner(googleAccount);
- } else {
- //toast("No Google account found, sync disabled.");
- m_syncClient.setOwner("TEST-ACCOUNT");
+
+ if (m_prefs.getBoolean("use_position_sync", false)) {
+ String googleAccount = getGoogleAccount();
+
+ if (googleAccount != null) {
+ m_syncClient.setOwner(googleAccount);
+ } else {
+ toast(R.string.error_sync_no_account);
+
+ SharedPreferences.Editor editor = m_prefs.edit();
+ editor.putBoolean("use_position_sync", false);
+ editor.commit();
+
+ //m_syncClient.setOwner("TEST-ACCOUNT");
+ }
}
}
diff --git a/src/org/fox/ttcomics/MainActivity.java b/src/org/fox/ttcomics/MainActivity.java index 4252955..6882767 100644 --- a/src/org/fox/ttcomics/MainActivity.java +++ b/src/org/fox/ttcomics/MainActivity.java @@ -57,7 +57,8 @@ public class MainActivity extends CommonActivity { } - @Override + @SuppressLint("NewApi") + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -216,8 +217,8 @@ public class MainActivity extends CommonActivity { if (requestCode == REQUEST_VIEWCOMIC) { //Log.d(TAG, "finished viewing comic: " + m_fileName); - if (m_prefs.getBoolean("use_position_sync", false)) { - toast("Uploading sync data..."); + if (m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) { + toast(R.string.sync_uploading); m_syncClient.setPosition(sha1(new File(m_fileName).getName()), getLastPosition(m_fileName)); } } |