gdrive sync

.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="lib" path="/Volumes/MacHDD/android-sdk/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"/>
 	<classpathentry kind="lib" path="libs/arity-1.3.3.jar"/>
 	<classpathentry kind="lib" path="libs/Zirconia.jar"/>
 	<classpathentry exported="true" kind="lib" path="/Volumes/MacHDD/android-sdk/extras/google/analytics_sdk_v2/libGoogleAnalyticsV2.jar"/>

libs/.gitignore

 /.DS_Store
+/google-api-*.jar
+/google-http-*.jar
+/gson-*.jar
+/google-oauth-*.jar
+/protobuf-java-*.jar
+/jsr305-*.jar
+/guava-jdk5-*.jar
+/jackson-core*.jar

project.properties

@@ -11,3 +11,4 @@
 target=android-14
 android.library.reference.1=subProj/lvl
 android.library=true
+android.library.reference.2=../../../../MacHDD/android-sdk/extras/google/google_play_services/libproject/google-play-services_lib

res/values-en/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="sync_gdrive_wait">Connecting to Google Drive...</string>
+    <string name="sync_detail_gdrive">1. In the PC version of Home Bookkeeping, select the Tools – Synchronization with a smartphone (Android) command.\n2. Perform the synchronization.\n3. Click the "Resume" button below.</string>
     <string name="gdrive_notlinked">Google Drive is not connected. It can be connected in the program settings. Do you want to do it now?</string>
     <string name="gdrive_gplay_error">Google Play is not available on your device.</string>
     <string name="gdrive_link_info">Google Drive account for sync and backup</string>

res/values-ru/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="sync_gdrive_wait">Подключение к Google Drive...</string>
+    <string name="sync_detail_gdrive">1. В меню Домашней бухгалтерии на ПК выберите Сервис - Синхронизация со смартфоном (Android).\n2. Выполните синхронизацию на ПК.\n3. Нажмите ниже на кнопку "Продолжить".</string>
     <string name="gdrive_notlinked">Google Диск не подключен. Его можно подключить в настройках программы. Хотите подключить его сейчас?</string>
     <string name="gdrive_gplay_error">Google Play не доступен на вашем устройстве.</string>
     <string name="gdrive_link_info">Использование Google Диск для синхронизации и резервного копирования</string>

src/com/keepsoft/homebuh/PrefsActivity.java

@@ -351,18 +351,21 @@ public class PrefsActivity extends PreferenceActivity {
 	protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
 		switch (requestCode) {
 		case REQUEST_ACCOUNT_PICKER:
+			PreferenceManager.getDefaultSharedPreferences(PrefsActivity.this).edit()
+			.remove(Constants.GDRIVE_ACCOUNT).commit();
 			if (resultCode == RESULT_OK && data != null && data.getExtras() != null) {
 				String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);
 				if (accountName != null) {
 					credential.setSelectedAccountName(accountName);
 					PreferenceManager.getDefaultSharedPreferences(PrefsActivity.this).edit()
 							.putString(Constants.GDRIVE_ACCOUNT, accountName).commit();
-					updateGdriveState();
 				}
 			}
+			updateGdriveState();
 			break;
 		case REQUEST_AUTHORIZATION:
 			if (resultCode == Activity.RESULT_OK) {
+				updateGdriveState();
 			} else {
 				startActivityForResult(credential.newChooseAccountIntent(), REQUEST_ACCOUNT_PICKER);
 			}