diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-15 17:13:32 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-15 17:13:32 +0400 |
| commit | 57169b8837bf612c58fdb4b0f4351aefbe05c907 (patch) | |
| tree | 7a96bd86a6e5276d0e88bf3008ef1d64d07d840e /src | |
| parent | 3274bb020d946322579f03ce96d6857c9d107251 (diff) | |
properly disable sync when no google account is found
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttcomics/CommonActivity.java | 23 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/MainActivity.java | 7 |
2 files changed, 19 insertions, 11 deletions
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)); } } |