Merge lp:~snert/financisto/main into lp:~financisto-dev/financisto/trunk

[Jan Scheithauer]

rudimentary dropbox integration

Unmerged revisions

142. By Jan Scheithauer <email address hidden> on 2011-02-18

removed dropbox key

141. By Jan Scheithauer <email address hidden> on 2011-01-31

ignore files set

140. By Jan Scheithauer <email address hidden> on 2011-01-31

Dropbox CSV Export added

=== modified file '.bzrignore'
--- .bzrignore	2010-12-09 15:02:12 +0000
+++ .bzrignore	2011-02-18 22:55:34 +0000
@@ -11,3 +11,6 @@
 Financisto.ipr
 Financisto.iws
 .settings
+.DS_Store
+.checkstyle
+financisto.keystore

=== modified file '.classpath'
--- .classpath	2010-12-09 15:02:12 +0000
+++ .classpath	2011-02-18 22:55:34 +0000
@@ -1,12 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="lib/trace-0.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/rfc2445-no-joda.jar"/>
-	<classpathentry kind="lib" path="lib/GDocsAPI.jar"/>
-	<classpathentry kind="lib" path="lib/CWAC-WakefulIntentService.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android 2.2 Google APIs"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="lib/trace-0.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rfc2445-no-joda.jar"/>
+	<classpathentry kind="lib" path="lib/GDocsAPI.jar"/>
+	<classpathentry kind="lib" path="lib/CWAC-WakefulIntentService.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android 2.2 Google APIs"/>
+	<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
+	<classpathentry kind="lib" path="lib/dropbox-client-1.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/httpmime-4.0.jar"/>
+	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/signpost-commonshttp4-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/signpost-core-1.2.1.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

=== added file 'lib/apache-mime4j-0.6.jar'
Binary files lib/apache-mime4j-0.6.jar	1970-01-01 00:00:00 +0000 and lib/apache-mime4j-0.6.jar	2011-02-18 22:55:34 +0000 differ
=== added file 'lib/dropbox-client-1.0-SNAPSHOT.jar'
Binary files lib/dropbox-client-1.0-SNAPSHOT.jar	1970-01-01 00:00:00 +0000 and lib/dropbox-client-1.0-SNAPSHOT.jar	2011-02-18 22:55:34 +0000 differ
=== added file 'lib/httpmime-4.0.jar'
Binary files lib/httpmime-4.0.jar	1970-01-01 00:00:00 +0000 and lib/httpmime-4.0.jar	2011-02-18 22:55:34 +0000 differ
=== added file 'lib/json_simple-1.1.jar'
Binary files lib/json_simple-1.1.jar	1970-01-01 00:00:00 +0000 and lib/json_simple-1.1.jar	2011-02-18 22:55:34 +0000 differ
=== added file 'lib/signpost-commonshttp4-1.2.1.1.jar'
Binary files lib/signpost-commonshttp4-1.2.1.1.jar	1970-01-01 00:00:00 +0000 and lib/signpost-commonshttp4-1.2.1.1.jar	2011-02-18 22:55:34 +0000 differ
=== added file 'lib/signpost-core-1.2.1.1.jar'
Binary files lib/signpost-core-1.2.1.1.jar	1970-01-01 00:00:00 +0000 and lib/signpost-core-1.2.1.1.jar	2011-02-18 22:55:34 +0000 differ
=== modified file 'res/values-de/strings.xml'
--- res/values-de/strings.xml	2011-01-06 00:27:00 +0000
+++ res/values-de/strings.xml	2011-02-18 22:55:34 +0000
@@ -621,5 +621,11 @@
     <string name="donate">Spenden</string>
     <string name="donate_error">Android Market ist auf dem Gerät nicht verfügbar</string>
     <string name="type">Typ</string>
-    
+    <string name="csv_export_dropbox">CSV Export Dropbox</string>
+    <string name="dropbox_backup">Dropbox</string>
+    <string name="dropbox_user_login">Login</string>
+    <string name="dropbox_user_login_summary">Dropbox-Login (Benutzername)</string>
+    <string name="dropbox_user_password">Passwort</string>
+    <string name="dropbox_user_password_summary">Dropbox Passwort</string>
+    <string name="dropbox_credentials_not_configured">Bitte geben Sie die Dropbox-Zugangsdaten in den Einstellungen an.</string> 
 </resources>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2011-02-18 09:00:25 +0000
+++ res/values/strings.xml	2011-02-18 22:55:34 +0000
@@ -616,6 +616,13 @@
     <string name="donate">Make a donation</string>
     <string name="donate_error">Android Market is not available on your device</string>
     <string name="type">Type</string>
+    <string name="csv_export_dropbox">CSV Export Dropbox</string>
+    <string name="dropbox_backup">Dropbox</string>
+    <string name="dropbox_user_login">Login</string>
+    <string name="dropbox_user_login_summary">Dropbox-Login</string>
+    <string name="dropbox_user_password">Password</string>
+    <string name="dropbox_user_password_summary">Dropbox Password</string>
+    <string name="dropbox_credentials_not_configured">Please set Dropbox account login and password on Preferences.</string>
 
     <string name="qif_export">QIF Export</string>
     <string name="qif_export_inprogress">Exporting data to QIF..</string>

=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	2010-12-11 14:17:43 +0000
+++ res/xml/preferences.xml	2011-02-18 22:55:34 +0000
@@ -123,6 +123,15 @@
         <EditTextPreference android:key="backup_folder"
                             android:title="@string/backup_folder" android:summary="@string/backup_folder_summary"/>
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/dropbox_backup">
+        <EditTextPreference android:key="dropbox_user_login"
+                            android:title="@string/dropbox_user_login" android:summary="@string/dropbox_user_login_summary"/>
+        <EditTextPreference
+                android:key="dropbox_user_password"
+                android:title="@string/dropbox_user_password"
+                android:password="true"
+                android:summary="@string/dropbox_user_password_summary"/>
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/other">
         <CheckBoxPreference android:key="include_transfers_into_reports"
                             android:title="@string/include_transfers_into_reports"

=== modified file 'src/ru/orangesoftware/financisto/activity/MainActivity.java'
--- src/ru/orangesoftware/financisto/activity/MainActivity.java	2011-02-18 09:00:25 +0000
+++ src/ru/orangesoftware/financisto/activity/MainActivity.java	2011-02-18 22:55:34 +0000
@@ -10,6 +10,30 @@
  ******************************************************************************/
 package ru.orangesoftware.financisto.activity;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import ru.orangesoftware.financisto.R;
+import ru.orangesoftware.financisto.backup.Backup;
+import ru.orangesoftware.financisto.backup.DatabaseExport;
+import ru.orangesoftware.financisto.backup.DatabaseImport;
+import ru.orangesoftware.financisto.backup.SettingsNotConfiguredException;
+import ru.orangesoftware.financisto.blotter.WhereFilter;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.db.DatabaseHelper;
+import ru.orangesoftware.financisto.dialog.WebViewDialog;
+import ru.orangesoftware.financisto.export.BackupExportTask;
+import ru.orangesoftware.financisto.export.CsvExportTask;
+import ru.orangesoftware.financisto.export.CsvExportTaskDropbox;
+import ru.orangesoftware.financisto.export.ImportExportAsyncTask;
+import ru.orangesoftware.financisto.export.ImportExportAsyncTaskListener;
+import ru.orangesoftware.financisto.model.Currency;
+import ru.orangesoftware.financisto.utils.CurrencyCache;
+import ru.orangesoftware.financisto.utils.EntityEnum;
+import ru.orangesoftware.financisto.utils.EnumUtils;
+import ru.orangesoftware.financisto.utils.MyPreferences;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -25,9 +49,17 @@
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
-import android.view.*;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.*;
+import android.view.Window;
+import android.widget.LinearLayout;
+import android.widget.ListAdapter;
+import android.widget.TabHost;
+import android.widget.TextView;
+import android.widget.Toast;
 import api.wireless.gdata.client.AbstructParserFactory;
 import api.wireless.gdata.client.GDataParserFactory;
 import api.wireless.gdata.client.ServiceDataClient;
@@ -40,7 +72,12 @@
 import api.wireless.gdata.parser.ParseException;
 import api.wireless.gdata.util.AuthenticationException;
 import api.wireless.gdata.util.ServiceException;
+
+import com.dropbox.client.DropboxAPI;
+import com.dropbox.client.DropboxAPI.Account;
+import com.dropbox.client.DropboxAPI.Config;
 import com.nullwire.trace.ExceptionHandler;
+<<<<<<< TREE
 import ru.orangesoftware.financisto.R;
 import ru.orangesoftware.financisto.backup.Backup;
 import ru.orangesoftware.financisto.backup.DatabaseExport;
@@ -65,18 +102,30 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
+=======
+>>>>>>> MERGE-SOURCE
 
 public class MainActivity extends TabActivity implements TabHost.OnTabChangeListener {
 	
+	final static public String ACCOUNT_PREFS_NAME = "prefs";
+    final static public String ACCESS_KEY_NAME = "ACCESS_KEY";
+    final static public String ACCESS_SECRET_NAME = "ACCESS_SECRET";
+	
 	private static final int ACTIVITY_PIN = 1;
 	private static final int ACTIVITY_CSV_EXPORT = 2;
+<<<<<<< TREE
     private static final int ACTIVITY_QIF_EXPORT = 3;
 
+=======
+	private static final int ACTIVITY_CSV_EXPORT_DROPBOX = 3;
+	
+>>>>>>> MERGE-SOURCE
 	private static final int MENU_PREFERENCES = Menu.FIRST+1;
 	private static final int MENU_ABOUT = Menu.FIRST+2;
 	private static final int MENU_BACKUP = Menu.FIRST+3;
 	private static final int MENU_RESTORE = Menu.FIRST+4;
 	private static final int MENU_CSV_EXPORT = Menu.FIRST+5;
+<<<<<<< TREE
 	private static final int MENU_SCHEDULED_TRANSACTIONS = Menu.FIRST+6;
 	private static final int MENU_BACKUP_GDOCS = Menu.FIRST+7;
 	private static final int MENU_RESTORE_GDOCS = Menu.FIRST+8;
@@ -84,6 +133,15 @@
 	private static final int MENU_MASS_OP = Menu.FIRST+10;
     private static final int MENU_DONATE = Menu.FIRST+11;
     private static final int MENU_QIF_EXPORT = Menu.FIRST+12;
+=======
+	private static final int MENU_CSV_EXPORT_DROPBOX = Menu.FIRST+6;
+	private static final int MENU_SCHEDULED_TRANSACTIONS = Menu.FIRST+7;
+	private static final int MENU_BACKUP_GDOCS = Menu.FIRST+8;
+	private static final int MENU_RESTORE_GDOCS = Menu.FIRST+9;
+	private static final int MENU_ENTITIES = Menu.FIRST+10;
+	private static final int MENU_MASS_OP = Menu.FIRST+11;
+    private static final int MENU_DONATE = Menu.FIRST+12;
+>>>>>>> MERGE-SOURCE
 
 	private final HashMap<String, Boolean> started = new HashMap<String, Boolean>();
 
@@ -135,7 +193,7 @@
 				finish();
 				System.exit(-1);
 			}
-		} else if (requestCode == ACTIVITY_CSV_EXPORT) {
+		} else if (requestCode == ACTIVITY_CSV_EXPORT || requestCode == ACTIVITY_CSV_EXPORT_DROPBOX) {
 			if (resultCode == RESULT_OK) {
 				WhereFilter filter = WhereFilter.fromIntent(data);
 				Currency currency = new Currency();
@@ -145,7 +203,13 @@
 				currency.decimals = data.getIntExtra(CsvExportActivity.CSV_EXPORT_DECIMALS, 2);
 				currency.decimalSeparator = data.getStringExtra(CsvExportActivity.CSV_EXPORT_DECIMAL_SEPARATOR);
 				currency.groupSeparator = data.getStringExtra(CsvExportActivity.CSV_EXPORT_GROUP_SEPARATOR);
-				doCsvExport(filter, currency, fieldSeparator, includeHeader);
+				if(requestCode == ACTIVITY_CSV_EXPORT){
+					doCsvExport(filter, currency, fieldSeparator, includeHeader);
+				}else if(requestCode == ACTIVITY_CSV_EXPORT_DROPBOX){
+					doCsvExportDropbox(filter, currency, fieldSeparator, includeHeader);
+				}else{
+					throw new RuntimeException("undefined requestCode: " + requestCode);
+				}
 			}
 		} else if (requestCode == ACTIVITY_QIF_EXPORT) {
 			if (resultCode == RESULT_OK) {
@@ -161,11 +225,30 @@
 		new CsvExportTask(this, d, filter, currency, fieldSeparator, includeHeader).execute((String[])null);
 	}
 	
+<<<<<<< TREE
     private void doQifExport(WhereFilter filter, long[] selectedAccounts) {
         ProgressDialog d = ProgressDialog.show(this, null, getString(R.string.qif_export_inprogress), true);
         new QifExportTask(this, d, filter, selectedAccounts).execute((String[])null);
     }
 
+=======
+	private void doCsvExportDropbox(WhereFilter filter, Currency currency, char fieldSeparaotr, boolean includeHeader) {
+		String droboxUsername = MyPreferences.getDropboxUserLogin(this);
+		String droboxPassword = MyPreferences.getDropboxUserPassword(this);
+		if( (droboxUsername==null||droboxUsername.equals("")) || (droboxPassword==null||droboxPassword.equals(""))) {
+			showErrorPopup(this,R.string.dropbox_credentials_not_configured);
+			return;
+		}
+		DropboxAPI api = createDropboxApi(droboxUsername, droboxPassword);
+		if(api==null){
+//			FIXME: api = null what to do??
+			return;
+		}
+		ProgressDialog d = ProgressDialog.show(this, null, getString(R.string.csv_export_inprogress), true);
+		new CsvExportTaskDropbox(this, d, filter, currency, fieldSeparaotr, includeHeader, api).execute((String[])null);
+	}
+	
+>>>>>>> MERGE-SOURCE
 	private void initialLoad() {
 		long t2, t1, t0 = System.currentTimeMillis();
 		DatabaseAdapter db = new DatabaseAdapter(this);
@@ -263,7 +346,11 @@
 		menu.addSubMenu(0, MENU_BACKUP_GDOCS, 0, R.string.backup_database_gdocs);
 		menu.addSubMenu(0, MENU_RESTORE_GDOCS, 0, R.string.restore_database_gdocs);
 		menu.addSubMenu(0, MENU_CSV_EXPORT, 0, R.string.csv_export);
+<<<<<<< TREE
         menu.addSubMenu(0, MENU_QIF_EXPORT, 0, R.string.qif_export);
+=======
+		menu.addSubMenu(0, MENU_CSV_EXPORT_DROPBOX, 0, R.string.csv_export_dropbox);
+>>>>>>> MERGE-SOURCE
         menu.addSubMenu(0, MENU_DONATE, 0, R.string.donate);
 		menu.addSubMenu(0, MENU_ABOUT, 0, R.string.about);
 		return true;
@@ -307,9 +394,15 @@
 		case MENU_CSV_EXPORT:
 			doCsvExport();
 			break;
+<<<<<<< TREE
         case MENU_QIF_EXPORT:
             doQifExport();
             break;
+=======
+		case MENU_CSV_EXPORT_DROPBOX:
+			doCsvExportDropbox();
+			break;
+>>>>>>> MERGE-SOURCE
 		case MENU_BACKUP:
 			doBackup();
 			break;
@@ -393,6 +486,42 @@
 		return googleDocsClient;
 	}
 	
+	/**
+	 * Connects to Dropbox
+	 */
+	protected DropboxAPI createDropboxApi(String droboxUsername, String droboxPassword){
+		DropboxAPI api = new DropboxAPI();
+		Config mConfig = api.getConfig(null, false);
+    	mConfig.consumerKey="";
+    	mConfig.consumerSecret="";
+    	mConfig.server="api.dropbox.com";
+    	mConfig.contentServer="api-content.dropbox.com";
+    	mConfig.port=80;
+    	
+        try {        	
+        	int success = DropboxAPI.STATUS_NONE;
+        	if (!api.isAuthenticated()) {
+	            mConfig = api.authenticate(mConfig, droboxUsername, droboxPassword);
+	            success = mConfig.authStatus;
+	            if (success != DropboxAPI.STATUS_SUCCESS) {
+	            	return null;
+	            }
+        	}
+        	Account mAccount = api.accountInfo();
+
+        	if (!mAccount.isError()) {
+        		showToast("Login successful: " + mAccount.displayName);
+        		return api;
+        	} else {
+        		showToast("Login not successful");
+        		return null;
+        	}
+        } catch (Exception e) {
+        	showToast("Error in logging in. " + e.getMessage());
+            return null;
+        }
+	}
+	
 	private void doBackup() {
 		ProgressDialog d = ProgressDialog.show(this, null, getString(R.string.backup_database_inprogress), true);
 		new BackupExportTask(this, d).execute((String[])null);
@@ -410,6 +539,12 @@
 		Intent intent = new Intent(this, CsvExportActivity.class);
 		startActivityForResult(intent, ACTIVITY_CSV_EXPORT);
 	}
+	
+	private void doCsvExportDropbox() {
+		Intent intent = new Intent(this, CsvExportActivity.class);
+		startActivityForResult(intent, ACTIVITY_CSV_EXPORT_DROPBOX);
+	}
+
 
     private void doQifExport() {
         Intent intent = new Intent(this, QifExportActivity.class);
@@ -722,4 +857,9 @@
 		
 	}
 	
+	public void showToast(String msg) {
+        Toast error = Toast.makeText(this, msg, Toast.LENGTH_LONG);
+        error.show();
+	}
+	
 }

=== added file 'src/ru/orangesoftware/financisto/export/CsvExportTaskDropbox.java'
--- src/ru/orangesoftware/financisto/export/CsvExportTaskDropbox.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/export/CsvExportTaskDropbox.java	2011-02-18 22:55:34 +0000
@@ -0,0 +1,40 @@
+package ru.orangesoftware.financisto.export;
+
+import ru.orangesoftware.financisto.blotter.WhereFilter;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.model.Currency;
+import android.app.ProgressDialog;
+import android.content.Context;
+
+import com.dropbox.client.DropboxAPI;
+
+public class CsvExportTaskDropbox extends ImportExportAsyncTask {
+	
+	private final WhereFilter filter; 
+	private final Currency currency;
+	private final char fieldSeparator;
+	private final boolean includeHeader;
+	private final DropboxAPI dropboxApi;
+	
+	public CsvExportTaskDropbox(Context context, ProgressDialog dialog, WhereFilter filter, Currency currency, 
+			char fieldSeparator, boolean includeHeader, DropboxAPI dropboxApi) {
+		super(context, dialog, null);
+		this.filter = filter;
+		this.currency = currency;
+		this.fieldSeparator = fieldSeparator;
+		this.includeHeader = includeHeader;
+		this.dropboxApi = dropboxApi;
+	}
+	
+	@Override
+	protected Object work(Context context, DatabaseAdapter db, String...params) throws Exception {
+		CSVExport export = new CSVExport(db, filter, currency, fieldSeparator, includeHeader);
+		return export.exportDropbox(dropboxApi);
+	}
+
+	@Override
+	protected String getSuccessMessage(Object result) {
+		return String.valueOf(result);
+	}
+
+}

=== modified file 'src/ru/orangesoftware/financisto/export/Export.java'
--- src/ru/orangesoftware/financisto/export/Export.java	2011-02-07 17:11:32 +0000
+++ src/ru/orangesoftware/financisto/export/Export.java	2011-02-18 22:55:34 +0000
@@ -22,6 +22,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.dropbox.client.DropboxAPI;
+
 import ru.orangesoftware.financisto.backup.SettingsNotConfiguredException;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Environment;
@@ -81,7 +83,24 @@
 		return fileName;
 	}
 	
+<<<<<<< TREE
 	private String generateFilename() {
+=======
+	public String exportDropbox(DropboxAPI api) throws Exception{	
+		// generation backup file
+		String fileName = generateFilename();
+		File path = getPath();
+		path.mkdirs();
+		File file = new File(path, fileName);		
+		FileOutputStream outputStream = new FileOutputStream(file);
+		generateBackup(outputStream);
+		api.putFile("dropbox", "/", file);
+		return fileName;
+	}
+	
+	private String generateFilename()
+	{
+>>>>>>> MERGE-SOURCE
 		SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd'_'HHmmss'_'SSS");
 		return df.format(new Date())+getExtension();
 	}

=== modified file 'src/ru/orangesoftware/financisto/utils/MyPreferences.java'
--- src/ru/orangesoftware/financisto/utils/MyPreferences.java	2011-01-30 13:13:22 +0000
+++ src/ru/orangesoftware/financisto/utils/MyPreferences.java	2011-02-18 22:55:34 +0000
@@ -186,6 +186,21 @@
 	}
 	
 	/**
+	 * Get drobox user login registered on preferences
+	 */
+	public static String getDropboxUserLogin(Context context){
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		return sharedPreferences.getString("dropbox_user_login", null);
+	}
+
+	/**
+	 * Get drobox user password registered on preferences
+	 */
+	public static String getDropboxUserPassword(Context context){
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		return sharedPreferences.getString("dropbox_user_password", null);		
+	}
+	/**
 	 * Gets the string representing reference currency registered on preferences to display chart reports.
 	 * @param context The activity context
 	 * @return  The string representing the currency registered as a reference to display chart reports or null if not configured yet.