Merge lp:~j-4-deactivatedaccount/tomdroid/folder-location into lp:~tomdroid-maintainers/tomdroid/main

[Stefan Hammer]

[lp:~j-4-deactivatedaccount/tomdroid/folder-location]

258. By Stefan Hammer on 2011-10-29

Disable Logging, remove changes in whitspace.

[Stefan Hammer (j-4-deactivatedaccount)]

Hi! I am quite sure, the code doesn't mess up something.
Still, can somebody build it and check for some unusual cases?
There should not be a problem with slashes before and after the folder name, one can also choose a subfolder. If the field is empty, it should load the notes from the root of the sd-card.
If there are no notes in the selected folder, a error message says: No notes found on SD card.

[Koichi Akabe (vbkaisetsu)]

Hi Stefan,

EditTextPreference is used for setting folder location now. I think it is troublesome.
If we can pick a location using a list, it's perfect!

How is your opinion?

[Stefan Hammer (j-4-deactivatedaccount)]

I also thought of giving the chance to write anything is probably not the best solution.
But if you write nonsense, the worst case scenario is Tomdroid telling you that it could not find any notes there.
So - nothing is ruined :-)

Your idea is to provide a list with all existing folders paths on the sdcard root?
This will be a long list.
Or we just list the folders without sub-directories... But some people wish this feature for synchronisation with Dropbox and I think they will need sub-directories then.
What is your exact idea?

[Koichi Akabe (vbkaisetsu)]

In my opinion, the list shows folders without sub-directories, and when we tapped a folder, then the list changes the current directory to tapped one. It's like a folder browser. And we put "Choose" and "Cancel" buttons to choose the folder.

I took a screenshot of the draft:
http://ubuntuone.com/4upyKmPn5BdXFKW3AJpFsZ

It's just a draft and it doesn't work.

[Stefan Hammer (j-4-deactivatedaccount)]

Mhmm. I am not really satisfied with setting up a whole filebrowser just for picking a foldername for the storage of the notes. Most of the Android applications do not offer to choose the folder name at all and just save where ever they think. I am also sure, this habit is kind of a android design thing, where folders and files don't play a role any more, because they make everything more complicated.

Our Location Setting would just be for power-users, who want to use Dropbox or need to customise everything.

I now thought of a simple ListPreference with Radiobuttons just showing the folders/paths where *.note files are saved. So we scrobble the sdcard for *.note files and present the positive folder-paths. If there are no notes stored on the sdcard, we show a hint telling to save the notes in one folder first, default would be /tomdroid.

I think this is probably the user-friendliest way, also considering the way a new user has to learn the approach. He will pick the SD-Card setting and then the location button is enabled -> clicking on there searches for notes. If there are already notes present, good - if not, we tell him, what to do next!

Do you think, this is good and can be done?

[Koichi Akabe (vbkaisetsu)]

I thought your idea is best.
RadioButton is useful and auto scanning function is great.

However it also have a problem.
We will add note taking feature. So I think some users will want to choose blank directory.

How do you think about it?

[Koichi Akabe (vbkaisetsu)]

Hi,

I created an experimental sub-branch that contains folder-browser to choose a location on SD card.
lp:~vbkaisetsu/tomdroid/folder-location-browser

Could you test it?

[lp:~j-4-deactivatedaccount/tomdroid/folder-location]

259. By Stefan Hammer on 2011-11-08

merged lp:tomdroid

260. By Stefan Hammer on 2012-01-12

Change PreferenceSummary to display folder path

261. By Stefan Hammer on 2012-01-12

merge lp:tomdroid

262. By Stefan Hammer on 2012-03-31

default.properties got renamed to project.properties

263. By Stefan Hammer on 2012-03-31

merged lp:tomdroid and made little improvements for error reporting.

264. By Stefan Hammer on 2012-03-31

merged with lp:tomdroid again

265. By Stefan Hammer on 2012-03-31

changed strings...

266. By Stefan Hammer on 2012-03-31

chaged error handling

267. By Stefan Hammer on 2012-03-31

merge lp:tomdroid

268. By Stefan Hammer on 2012-03-31

remove whitespace and unused imports.

[Olivier Bilodeau (plaxx)]

Fine like that.

review: Approve

=== added file 'project.properties'
--- project.properties	1970-01-01 00:00:00 +0000
+++ project.properties	2012-03-31 20:36:20 +0000
@@ -0,0 +1,17 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=android-4
+apk-configurations=

=== removed file 'project.properties'
--- project.properties	2012-03-31 18:40:05 +0000
+++ project.properties	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-4
-apk-configurations=

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2012-03-31 20:27:03 +0000
+++ res/values/strings.xml	2012-03-31 20:36:20 +0000
@@ -55,6 +55,9 @@
 	<string name="prefSDCard">SD Card</string>
 	<string name="prefTomboyWeb">Online Synchronization</string>
 	<string name="prefAuthenticate">Authenticate</string>
+	<string name="prefLocation">Location on SD Card</string>
+	<string name="prefFolderCreated">The folder \"%1$s\" does not exist yet. Please connect your device to the computer, create the folder and fill it with *.note files.</string>
+	<string name="prefNoValidLocation">\"%1$s\" is no valid folder location. Please try again!</string>
 	
 	<string name="prefSyncCompleteAuth">Completing authentication. Please wait...</string>
 	<string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>

=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	2011-09-05 21:44:12 +0000
+++ res/xml/preferences.xml	2012-03-31 20:36:20 +0000
@@ -34,6 +34,11 @@
 							android:title="@string/prefSyncServer"
 							android:positiveButtonText="@string/prefAuthenticate"
 							android:shouldDisableView="true"/>
+		
+		<EditTextPreference android:key="sd_location"
+							android:title="@string/prefLocation"
+							android:positiveButtonText="@string/btnOk"
+							android:shouldDisableView="true"/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/prefSearch">
 		<Preference

=== modified file 'src/org/tomdroid/sync/SyncService.java'
--- src/org/tomdroid/sync/SyncService.java	2012-03-31 14:36:55 +0000
+++ src/org/tomdroid/sync/SyncService.java	2012-03-31 20:36:20 +0000
@@ -85,6 +85,7 @@
 	
 	protected abstract void sync();
 	public abstract boolean needsServer();
+	public abstract boolean needsLocation();
 	public abstract boolean needsAuth();
 	
 	/**

=== modified file 'src/org/tomdroid/sync/sd/SdCardSyncService.java'
--- src/org/tomdroid/sync/sd/SdCardSyncService.java	2012-03-31 14:36:55 +0000
+++ src/org/tomdroid/sync/sd/SdCardSyncService.java	2012-03-31 20:36:20 +0000
@@ -72,6 +72,11 @@
 	}
 	
 	@Override
+	public boolean needsLocation() {
+		return true;
+	}
+	
+	@Override
 	public boolean needsAuth() {
 		return false;
 	}

=== modified file 'src/org/tomdroid/sync/web/SnowySyncService.java'
--- src/org/tomdroid/sync/web/SnowySyncService.java	2012-03-31 14:36:55 +0000
+++ src/org/tomdroid/sync/web/SnowySyncService.java	2012-03-31 20:36:20 +0000
@@ -69,6 +69,10 @@
 	}
 	
 	@Override
+	public boolean needsLocation() {
+		return false;
+	}	
+	@Override
 	public boolean needsAuth() {
 		return true;
 	}

=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
--- src/org/tomdroid/ui/PreferencesActivity.java	2011-10-27 16:33:12 +0000
+++ src/org/tomdroid/ui/PreferencesActivity.java	2012-03-31 20:36:20 +0000
@@ -30,6 +30,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.EditTextPreference;
@@ -50,6 +51,7 @@
 import org.tomdroid.util.SearchSuggestionProvider;
 import org.tomdroid.util.TLog;
 
+import java.io.File;
 import java.util.ArrayList;
 
 public class PreferencesActivity extends PreferenceActivity {
@@ -59,6 +61,7 @@
 	// TODO: put the various preferences in fields and figure out what to do on activity suspend/resume
 	private EditTextPreference syncServer = null;
 	private ListPreference syncService = null;
+	private EditTextPreference sdLocation = null;
 	private Preference clearSearchHistory = null;
 	
 	@Override
@@ -70,6 +73,7 @@
 		// Fill the Preferences fields
 		syncServer = (EditTextPreference)findPreference(Preferences.Key.SYNC_SERVER.getName());
 		syncService = (ListPreference)findPreference(Preferences.Key.SYNC_SERVICE.getName());
+		sdLocation = (EditTextPreference)findPreference(Preferences.Key.SD_LOCATION.getName());
 		clearSearchHistory = (Preference)findPreference(Preferences.Key.CLEAR_SEARCH_HISTORY.getName());
 		
 		// Set the default values if nothing exists
@@ -115,6 +119,39 @@
 			
 		});
 		
+		// Change the Folder Location
+		sdLocation.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+
+			public boolean onPreferenceChange(Preference preference, Object locationUri) {
+
+				if (locationUri.equals(Preferences.getString(Preferences.Key.SD_LOCATION))) { 
+					return false;
+				}
+				if (locationUri.toString().contains("\n")) { 
+					noValidLocation(locationUri.toString());
+					return false;
+				}
+				
+				File path = new File(Environment.getExternalStorageDirectory()
+						+ "/" + locationUri + "/");
+
+				if(!path.exists()) {
+					TLog.d(TAG, "Folder {0} does not exist.", path);
+					folderNotExisting(path.toString());
+					return false;
+				}
+				
+				Preferences.putString(Preferences.Key.SD_LOCATION, locationUri.toString());
+				TLog.d(TAG, "Changed Folder to: " + path.toString());
+
+				Tomdroid.NOTES_PATH = path.toString();
+				sdLocation.setSummary(Tomdroid.NOTES_PATH);
+
+				resetLocalDatabase();
+				return true;
+			}
+		});
+		
 		//delete Search History
 		clearSearchHistory.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 	        public boolean onPreferenceClick(Preference preference) {
@@ -207,6 +244,11 @@
 		syncService.setDefaultValue(defaultService);
 		if(syncService.getValue() == null)
 			syncService.setValue(defaultService);
+		
+		String defaultLocation = (String)Preferences.Key.SD_LOCATION.getDefault();
+		sdLocation.setDefaultValue(defaultLocation);
+		if(sdLocation.getText() == null)
+			sdLocation.setText(defaultLocation);
 	
 	}
 
@@ -219,6 +261,8 @@
 
 		syncServer.setEnabled(service.needsServer());
 		syncService.setSummary(service.getDescription());
+		sdLocation.setEnabled(service.needsLocation());
+		sdLocation.setSummary(Tomdroid.NOTES_PATH);
 	}
 		
 	private void connectionFailed() {
@@ -230,6 +274,26 @@
 				}})
 			.show();
 	}
+	
+	private void folderNotExisting(String path) {
+		new AlertDialog.Builder(this)
+			.setMessage(String.format(getString(R.string.prefFolderCreated), path))
+			.setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}})
+			.show();
+	}
+	
+	private void noValidLocation(String path) {
+		new AlertDialog.Builder(this)
+			.setMessage(String.format(getString(R.string.prefNoValidLocation), path))
+			.setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}})
+			.show();
+	}
 
 	//TODO use LocalStorage wrapper from two-way-sync branch when it get's merged
 	private void resetLocalDatabase() {

=== modified file 'src/org/tomdroid/ui/ShortcutActivity.java'
--- src/org/tomdroid/ui/ShortcutActivity.java	2012-03-31 19:21:16 +0000
+++ src/org/tomdroid/ui/ShortcutActivity.java	2012-03-31 20:36:20 +0000
@@ -25,7 +25,6 @@
 import android.app.ListActivity;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;

=== modified file 'src/org/tomdroid/ui/Tomdroid.java'
--- src/org/tomdroid/ui/Tomdroid.java	2012-03-31 19:16:05 +0000
+++ src/org/tomdroid/ui/Tomdroid.java	2012-03-31 20:36:20 +0000
@@ -55,15 +55,6 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import org.tomdroid.Note;
-import org.tomdroid.NoteManager;
-import org.tomdroid.R;
-import org.tomdroid.sync.ServiceAuth;
-import org.tomdroid.sync.SyncManager;
-import org.tomdroid.sync.SyncService;
-import org.tomdroid.util.FirstNote;
-import org.tomdroid.util.Preferences;
-import org.tomdroid.util.Send;
 import org.tomdroid.util.TLog;
 
 public class Tomdroid extends ListActivity {
@@ -78,9 +69,8 @@
 	public static final String	PROJECT_HOMEPAGE	= "http://www.launchpad.net/tomdroid/";
 
 	// config parameters
-	// TODO hardcoded for now
-	public static final String	NOTES_PATH			= Environment.getExternalStorageDirectory()
-															+ "/tomdroid/";
+	public static String	NOTES_PATH				= null;
+	
 	// Set this to false for release builds, the reason should be obvious
 	public static final boolean	CLEAR_PREFERENCES	= false;
 
@@ -106,6 +96,10 @@
 		setContentView(R.layout.main);
 		Preferences.init(this, CLEAR_PREFERENCES);
 
+		// get the Path to the notes-folder from Preferences
+		NOTES_PATH = Environment.getExternalStorageDirectory()
+				+ "/" + Preferences.getString(Preferences.Key.SD_LOCATION) + "/";
+		
 		// did we already show the warning and got destroyed by android's activity killer?
 		if (Preferences.getBoolean(Preferences.Key.FIRST_RUN)) {
 			TLog.i(TAG, "Tomdroid is first run.");

=== modified file 'src/org/tomdroid/util/Preferences.java'
--- src/org/tomdroid/util/Preferences.java	2011-09-04 17:48:08 +0000
+++ src/org/tomdroid/util/Preferences.java	2012-03-31 20:36:20 +0000
@@ -34,6 +34,7 @@
 		SYNC_SERVER_ROOT_API ("sync_server_root_api", ""),
 		SYNC_SERVER_USER_API ("sync_server_user_api", ""),
 		SYNC_SERVER ("sync_server", "https://one.ubuntu.com/notes"),
+		SD_LOCATION ("sd_location", "tomdroid"),
 		CLEAR_SEARCH_HISTORY ("clearSearchHistory", ""),
 		ACCESS_TOKEN ("access_token", ""),
 		ACCESS_TOKEN_SECRET ("access_token_secret", ""),