+ * Use this instead of integers in the account configuration. Store the name of the security type
+ * instead.
+ *
+ * The items annotated with @SuppressWarnings("unused") are used but only by code that calls the
+ * from method so the analyser cannot see that they are used
+ */
+public enum Security {
+ None("None", "", "imap", false),
+ @SuppressWarnings("unused")
+ SSL_TLS("SSL/TLS", "993", "imaps", false),
+ @SuppressWarnings("unused")
+ SSL_TLS_accept_all_certificates("SSL/TLS (accept all certificates)", "993", "imaps", true),
+ @SuppressWarnings("unused")
+ STARTTLS("STARTTLS", "143", "imaps", false),
+ @SuppressWarnings("unused")
+ STARTTLS_accept_all_certificates("STARTTLS (accept all certificates)", "143", "imaps", true);
+
+ @NonNull
+ static final String TAG = "IN_Security";
+ public final String proto;
+ public final boolean acceptcrt;
+
+
+ private final String printable;
+ public final String defaultPort;
+
+ Security(String printable,
+ String defaultPort,
+ String proto,
+ boolean acceptcrt) {
+ this.printable = printable;
+ this.defaultPort = defaultPort;
+ this.proto = proto;
+ this.acceptcrt = acceptcrt;
+ }
+
+ @NonNull
+ public static List
+ * Reduce repetition by providing static fields and methods for common operations.
+ */
+public class Utilities {
+
+ /**
+ * The notes have a time stamp associated with thme and this is stored as a string on the
+ * server so we must define a fixed format for it.
+ */
+ @NonNull
+ private static final String internalDateFormatString = "yyyy-MM-dd HH:mm:ss";
+ @NonNull
+ public static final SimpleDateFormat internalDateFormat = new SimpleDateFormat(internalDateFormatString, Locale.ROOT);
+}
diff --git a/ImapNote2/src/main/java/com/Pau/ImapNotes2/Data/VectorDb.java b/ImapNote2/src/main/java/com/Pau/ImapNotes2/Data/VectorDb.java
new file mode 100644
index 00000000..ca48036a
--- /dev/null
+++ b/ImapNote2/src/main/java/com/Pau/ImapNotes2/Data/VectorDb.java
@@ -0,0 +1,264 @@
+package com.Pau.ImapNotes2.Data;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.io.File;
+
+
+/**
+ * Created by kj on 2017-01-09 10:28.
+ *
+ * This class manages the tables used for vector clocks and other data associated with automatic
+ * conflict resolution and merging.
+ */
+
+class VectorDb {
+
+
+ /**
+ * Reference to the SQLite database used for all data in this application.
+ */
+ @NonNull
+ private final Db db;
+ @NonNull
+ private final FileTable fileTable;
+ @NonNull
+ private final VectorTable vectorTable;
+
+ public VectorDb(@NonNull Db db) {
+ this.db = db;
+ vectorTable = new VectorTable();
+ fileTable = new FileTable();
+ }
+
+ void CreateTables(SQLiteDatabase db) {
+ vectorTable.CreateTable(db);
+ fileTable.CreateTable(db);
+ }
+
+/*
+ public void CreateTables(@NonNull SQLiteDatabase db) {
+ fileTable.CreateTable(db);
+ vectorTable.CreateTable(db);
+ }
+*/
+
+
+ class VectorTable {
+
+ private static final String TAG = "IN_VectorTable";
+
+ private static final String COL_FILE_PATH = "filepath";
+ private static final String COL_CLOCK = "clock";
+ private static final String COL_ACCOUNT_NAME = "accountname";
+ private static final String TABLE_NAME = "vector";
+ //private static final String DATABASE_NAME = "NotesDb";
+
+ private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_NAME
+ + " ("
+ + COL_FILE_PATH + " text not null, "
+ + COL_CLOCK + " text not null, "
+ + COL_ACCOUNT_NAME + " text not null, "
+ + " PRIMARY KEY (" + COL_FILE_PATH + ", " + COL_ACCOUNT_NAME + "));";
+
+
+
+ void CreateTable(@NonNull SQLiteDatabase db) {
+ db.execSQL(CREATE_TABLE);
+ }
+
+ public void Insert(@NonNull File file,
+ @NonNull String accountname,
+ int clock) {
+ ContentValues tableRow = new ContentValues();
+ tableRow.put(COL_FILE_PATH, file.getName());
+ tableRow.put(COL_ACCOUNT_NAME, accountname);
+ tableRow.put(COL_CLOCK, clock);
+ db.notesDb.insertWithOnConflict(TABLE_NAME, null, tableRow,
+ SQLiteDatabase.CONFLICT_REPLACE);
+ }
+/*
+ // TODO: Should use place holders instead of string concatenation.
+ public void Delete(@NonNull File file,
+ @NonNull String accountname) {
+ db.notesDb.execSQL("delete from " + TABLE_NAME + " where " + COL_FILE_PATH + " = '" + file.getAbsolutePath() +
+ "' and accountname = '" + accountname + "'");
+ }*/
+
+
+ void IncrementVectorClock(String relativeFile,
+ String acountName) {
+
+ }
+ }
+
+ class FileTable {
+
+ private static final String TAG = "IN_FileTable";
+
+ private static final String COL_FILE_PATH = "filepath";
+ private static final String COL_MTIME = "mtime";
+ private static final String COL_ACCOUNT_NAME = "accountname";
+ private static final String TABLE_NAME = "file";
+ //private static final String DATABASE_NAME = "NotesDb";
+
+ private static final String CREATE_FILE_TABLE = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_NAME
+ + " (pk integer primary key autoincrement, "
+ + COL_FILE_PATH + " text not null, "
+ + COL_MTIME + " text not null, "
+ + COL_ACCOUNT_NAME + " text not null);";
+
+
+
+
+
+ void CreateTable(@NonNull SQLiteDatabase db) {
+ db.execSQL(CREATE_FILE_TABLE);
+ }
+
+ /**
+ * Update the mtime in the database and increment the vetor clock for this device.
+ *
+ * @param relativeFile
+ * @param lastModified
+ * @param accountName
+ */
+ private void UpdateLastModified(String relativeFile,
+ Long lastModified,
+ String accountName) {
+ ContentValues newMTime = new ContentValues();
+ newMTime.put(COL_MTIME, lastModified);
+
+ db.notesDb.update(TABLE_NAME, newMTime,
+ "? = ? and ? = ?",
+ new String[]{COL_FILE_PATH, relativeFile, COL_ACCOUNT_NAME, accountName});
+ }
+
+ public void Insert(@NonNull String relativeFile,
+ Long lastModified,
+ @NonNull String accountname,
+ @NonNull File accountDir) {
+ ContentValues tableRow = new ContentValues();
+ tableRow.put(COL_FILE_PATH, relativeFile);
+ tableRow.put(COL_MTIME, lastModified);
+ tableRow.put(COL_ACCOUNT_NAME, accountname);
+ db.notesDb.insert(TABLE_NAME, null, tableRow);
+ Log.d(TAG, "note inserted");
+ }
+
+
+
+ // TODO: Should use place holders instead of string concatenation.
+ public void Delete(@NonNull File file,
+ @NonNull String accountname) {
+ db.notesDb.execSQL("delete from " + TABLE_NAME + " where " + COL_FILE_PATH + " = '" + file.getAbsolutePath() +
+ "' and accountname = '" + accountname + "'");
+ }
+
+
+ public long GetMTime(@NonNull String relativeFilePath,
+ @NonNull String accountname) {
+ try (Cursor c = GetRecord(relativeFilePath, accountname)) {
+ return (c == null) ? 0 : c.getLong(c.getColumnIndex(COL_MTIME));
+ }
+ }
+/*
+
+ public long GetMTime(@NonNull String relativeFilePath,
+ @NonNull String accountname) {
+ String selectQuery = "select mtime from " + TABLE_NAME +
+ " where " + COL_FILE_PATH + " = '" + relativeFilePath + "' " + " " +
+ " and accountname = '" + accountname + "'";
+ try (Cursor c = db.notesDb.rawQuery(selectQuery, null)) {
+ if (c.moveToFirst()) {
+ return c.getLong(Cursor.FIELD_TYPE_NULL);
+ }
+ }
+ return 0;
+ }
+
+*/
+
+ @Nullable
+ public Cursor GetRecord(@NonNull String relativeFilePath,
+ @NonNull String accountname) {
+ String selectQuery = "select " +
+ COL_ACCOUNT_NAME + ", " + COL_FILE_PATH + ", " + COL_MTIME +
+ " from " + TABLE_NAME +
+ " where " + COL_FILE_PATH + " = '" + relativeFilePath + "' " + " " +
+ " and " + COL_ACCOUNT_NAME + " = '" + accountname + "'";
+ Cursor c = db.notesDb.rawQuery(selectQuery, null);
+ return c.moveToFirst() ? c : null;
+ }
+
+
+ }
+
+
+ /**
+ * Update the mtime in the database and increment the vetor clock for this device.
+ * TODO: Use a transaction to ensure that either the mtime and vector succeed or neither.
+ *
+ * @param relativeFile
+ * @param lastModified
+ * @param accountName
+ */
+ private void Update(String relativeFile,
+ Long lastModified,
+ String accountName) {
+ fileTable.UpdateLastModified(relativeFile, lastModified, accountName);
+ vectorTable.IncrementVectorClock(relativeFile, accountName);
+ }
+
+ /**
+ * Enumerate the file in the given directory and update the mtime and vector clock in the
+ * database.
+ *
+ * @param accountName
+ * @param accountRoot
+ */
+ public void UpdateAccount(@NonNull String accountName,
+ @NonNull File accountRoot) {
+ for (File file : accountRoot.listFiles()) {
+ UpdateFile(file, accountName, accountRoot);
+ }
+ }
+
+ public void UpdateFile(@NonNull File file,
+ @NonNull String accountName,
+ @NonNull File accountRoot) {
+
+ String relativeFile = RelativePath(accountRoot, file);
+ try (Cursor c = fileTable.GetRecord(RelativePath(accountRoot, file), accountName)) {
+ if (c == null) {
+ // Add new record
+ fileTable.Insert(relativeFile, file.lastModified(), accountName, accountRoot);
+ } else {
+ // Update existing record by incrementing the vector
+ Update(relativeFile, file.lastModified(), accountName);
+ }
+ }
+ }
+
+ /**
+ * See http://www.java2s.com/Tutorial/Java/0180__File/Getrelativepath.htm
+ *
+ * @param base
+ * @param file
+ * @return
+ */
+ @NonNull
+ public String RelativePath(@NonNull final File base, @NonNull final File file) {
+ final int rootLength = base.getAbsolutePath().length();
+ final String absFileName = file.getAbsolutePath();
+ return absFileName.substring(rootLength + 1);
+ }
+
+}
diff --git a/ImapNote2/src/main/java/com/Pau/ImapNotes2/Data/VectorNote.java b/ImapNote2/src/main/java/com/Pau/ImapNotes2/Data/VectorNote.java
new file mode 100644
index 00000000..2ffb74aa
--- /dev/null
+++ b/ImapNote2/src/main/java/com/Pau/ImapNotes2/Data/VectorNote.java
@@ -0,0 +1,50 @@
+package com.Pau.ImapNotes2.Data;
+
+import android.support.annotation.NonNull;
+
+import java.util.Date;
+import java.util.HashMap;
+
+
+/**
+ * Created by kj on 2017-01-09 10:59.
+ *
+ * Represents metadata about a note in a way that can be used by a ListAdapter. The list adapter
+ * needs objects that have a map interface because it must fetch the items by string name.
+ */
+public class VectorNote extends HashMap ", " ", " ", " ", " ", " ", " ", " ", " ", "
* Binding data to views occurs in two phases. First, if a
* {@link android.widget.SimpleAdapter.ViewBinder} is available,
* {@link ViewBinder#setViewValue(android.view.View, Object, String)}
- * is invoked. If the returned value is true, binding has occurred.
+ * is invoked. If the returned value is true, binding has occurred.
* If the returned value is false, the following views are then tried in order:
* Sets the layout resource to create the drop down views. Sets the layout resource to create the drop down views.
* This method is called instead of {@link #setViewImage(ImageView, String)}
* if the supplied data is an int or Integer.
*
- * @param v ImageView to receive an image
+ * @param v ImageView to receive an image
* @param value the value retrieved from the data set
- *
* @see #setViewImage(ImageView, String)
*/
- public void setViewImage(ImageView v, int value) {
+ private void setViewImage(@NonNull ImageView v, int value) {
v.setImageResource(value);
}
@@ -250,20 +258,19 @@ public void setViewImage(ImageView v, int value) {
* Called by bindView() to set the image for an ImageView but only if
* there is no existing ViewBinder or if the existing ViewBinder cannot
* handle binding to an ImageView.
- *
+ *
* By default, the value will be treated as an image resource. If the
* value cannot be used as an image resource, the value is used as an
* image Uri.
- *
+ *
* This method is called instead of {@link #setViewImage(ImageView, int)}
* if the supplied data is not an int or Integer.
*
- * @param v ImageView to receive an image
+ * @param v ImageView to receive an image
* @param value the value retrieved from the data set
- *
- * @see #setViewImage(ImageView, int)
+ * @see #setViewImage(ImageView, int)
*/
- public void setViewImage(ImageView v, String value) {
+ private void setViewImage(@NonNull ImageView v, String value) {
try {
v.setImageResource(Integer.parseInt(value));
} catch (NumberFormatException nfe) {
@@ -276,10 +283,10 @@ public void setViewImage(ImageView v, String value) {
* there is no existing ViewBinder or if the existing ViewBinder cannot
* handle binding to a TextView.
*
- * @param v TextView to receive text
+ * @param v TextView to receive text
* @param text the text to be set for the TextView
*/
- public void setViewText(TextView v, String text) {
+ private void setViewText(@NonNull TextView v, String text) {
v.setText(text);
}
@@ -293,7 +300,7 @@ public Filter getFilter() {
/**
* This class can be used by external clients of SimpleAdapter to bind
* values to views.
- *
+ *
* You should use this class to bind values to views that are not
* directly supported by SimpleAdapter or to change the way binding
* occurs for views supported by SimpleAdapter.
@@ -302,20 +309,19 @@ public Filter getFilter() {
* @see SimpleAdapter#setViewImage(ImageView, String)
* @see SimpleAdapter#setViewText(TextView, String)
*/
- public static interface ViewBinder {
+ interface ViewBinder {
/**
* Binds the specified data to the specified view.
- *
+ *
* When binding is handled by this ViewBinder, this method must return true.
* If this method returns false, SimpleAdapter will attempts to handle
* the binding on its own.
*
- * @param view the view to bind the data to
- * @param data the data to bind to the view
+ * @param view the view to bind the data to
+ * @param data the data to bind to the view
* @param textRepresentation a safe String representation of the supplied data:
- * it is either the result of data.toString() or an empty String but it
- * is never null
- *
+ * it is either the result of data.toString() or an empty String but it
+ * is never null
* @return true if the data was bound to the view, false otherwise
*/
boolean setViewValue(View view, Object data, String textRepresentation);
@@ -328,12 +334,13 @@ public static interface ViewBinder {
*/
private class SimpleFilter extends Filter {
+ @NonNull
@Override
- protected FilterResults performFiltering(CharSequence prefix) {
+ protected FilterResults performFiltering(@Nullable CharSequence prefix) {
FilterResults results = new FilterResults();
if (mUnfilteredData == null) {
- mUnfilteredData = new ArrayList
\n", "
\n", "
");
stringres = stringres.replaceAll("
");
- return new Sticky(stringres, "", "NONE");
- }
-
- private void WriteMailToFile (String suid, Message message) {
- String directory = (ImapNotes2.getAppContext()).getFilesDir() + "/" +
- Listactivity.imapNotes2Account.GetAccountname();
- try {
- File outfile = new File (directory, suid);
- OutputStream str = new FileOutputStream(outfile);
- message.writeTo(str);
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ return new Sticky(stringres, Colors.NONE);
}
+// --Commented out by Inspection START (12/2/16 8:50 PM):
+// private void WriteMailToFile(@NonNull String suid, @NonNull Message message) {
+// String directory = getApplicationContext().getFilesDir() + "/" +
+// Listactivity.imapNotes2Account.accountName;
+// try {
+// File outfile = new File(directory, suid);
+// OutputStream str = new FileOutputStream(outfile);
+// message.writeTo(str);
+// } catch (Exception e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// }
+// --Commented out by Inspection STOP (12/2/16 8:50 PM)
}
diff --git a/ImapNote2/src/main/java/com/Pau/ImapNotes2/NotesListAdapter.java b/ImapNote2/src/main/java/com/Pau/ImapNotes2/NotesListAdapter.java
index 2568530c..7b6821a7 100644
--- a/ImapNote2/src/main/java/com/Pau/ImapNotes2/NotesListAdapter.java
+++ b/ImapNote2/src/main/java/com/Pau/ImapNotes2/NotesListAdapter.java
@@ -17,6 +17,10 @@
*/
import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
@@ -24,9 +28,8 @@
import android.widget.Filter;
import android.widget.Filterable;
import android.widget.ImageView;
+import android.widget.SimpleAdapter;
import android.widget.TextView;
-import android.view.LayoutInflater;
-import android.net.Uri;
import java.util.ArrayList;
import java.util.List;
@@ -38,60 +41,57 @@
* in the list. The Maps contain the data for each row. You also specify an XML file that
* defines the views used to display the row, and a mapping from keys in the Map to specific
* views.
- *
+ *
*
* If no appropriate binding can be found, an {@link IllegalStateException} is thrown.
*/
public class NotesListAdapter extends BaseAdapter implements Filterable {
- private int[] mTo;
- private String[] mFrom;
- private ViewBinder mViewBinder;
+ private final int[] mTo;
+ private final String[] mFrom;
+ // --Commented out by Inspection (12/3/16 11:31 PM):private ViewBinder mViewBinder;
private List> mData;
- private int mResource;
- private int mDropDownResource;
- private LayoutInflater mInflater;
+ private final int mResource;
+ private final int mDropDownResource;
+ @NonNull
+ private final LayoutInflater mInflater;
private SimpleFilter mFilter;
private ArrayList
");
+ }
+ */
+ return new Sticky(
+ getText(stringres),
+ getColor(stringres));
}
+/*
+ private static String getPosition(String stringres) {
+
+ Matcher matcherPosition = patternPosition.matcher(stringres);
+ return matcherPosition.find() ?
+ matcherPosition.group(1) :
+ "";
+ }*/
+
+ private static String getText(@NonNull String stringres) {
+ Matcher matcherText = patternText.matcher(stringres);
+ String text = "";
+ if (matcherText.find()) {
+ text = matcherText.group(1);
+ // Kerio Connect puts CR+LF+space every 78 characters from line 2
+ // first line seem to be smaller. We remove these characters
+ text = text.replaceAll("\r\n ", "");
+ // newline in Kerio is the string (not the character) "\n"
+ text = text.replaceAll("\\\\n", "
");
+ }
+ return text;
+ }
+
+ @NonNull
+ private static Colors getColor(@NonNull String stringres) {
+ Matcher matcherColor = patternColor.matcher(stringres);
+ if (matcherColor.find()) {
+ String colorName = matcherColor.group(1);
+ return ((colorName == null) || colorName.equals("null")) ?
+ Colors.NONE :
+ Colors.valueOf(colorName);
+ } else {
+ return Colors.NONE;
+ }
- props.setProperty("mail.imap.connectiontimeout","1000");
- if (useProxy) {
- props.put("mail.imap.socks.host","10.0.2.2");
- props.put("mail.imap.socks.port","1080");
}
- session = Session.getInstance(props, null);
-//this.session.setDebug(true);
- store = session.getStore(proto);
- try {
- store.connect(server, username, password);
- res.hasUIDPLUS = ((IMAPStore) store).hasCapability("UIDPLUS");
-//Log.d(TAG, "has UIDPLUS="+res.hasUIDPLUS);
- Folder[] folders = store.getPersonalNamespaces();
- Folder folder = folders[0];
-//Log.d(TAG,"Personal Namespaces="+folder.getFullName());
- if (folderoverride.length() > 0) {
- sfolder = folderoverride;
- } else if (folder.getFullName().length() == 0) {
- sfolder = "Notes";
- } else {
- char separator = folder.getSeparator();
- sfolder = folder.getFullName() + separator + "Notes";
- }
- // Get UIDValidity
- notesFolder = store.getFolder(sfolder);
- res.UIDValidity = ((IMAPFolder) notesFolder).getUIDValidity();
- res.errorMessage = "";
- res.returnCode = 0;
- res.notesFolder = notesFolder;
- return res;
- } catch (Exception e) {
- Log.d(TAG, e.getMessage());
- res.errorMessage = e.getMessage();
- res.returnCode = -2;
- return res;
+ private static boolean IsConnected() {
+ return store != null && store.isConnected();
+ }
+
+ static void DeleteNote(int numMessage) throws MessagingException {
+ Log.d(TAG,"DeleteNote: " + numMessage);
+ Folder notesFolder = store.getFolder(sfolder);
+ if (notesFolder.isOpen()) {
+ if ((notesFolder.getMode() & Folder.READ_WRITE) != 0) {
+ notesFolder.open(Folder.READ_WRITE);
+ }
+ } else {
+ notesFolder.open(Folder.READ_WRITE);
+ }
+
+ //Log.d(TAG,"UID to remove:"+numMessage);
+ Message[] msgs = {((IMAPFolder) notesFolder).getMessageByUID(numMessage)};
+ notesFolder.setFlags(msgs, new Flags(Flags.Flag.DELETED), true);
+ ((IMAPFolder) notesFolder).expunge(msgs);
+ }
+
+ // Put values in shared preferences
+ static void SetUIDValidity(@NonNull Account account,
+ Long UIDValidity,
+ @NonNull Context ctx) {
+ Log.d(TAG,"SetUIDValidity: " + account.name);
+ SharedPreferences preferences = ctx.getSharedPreferences(account.name, Context.MODE_MULTI_PROCESS);
+ SharedPreferences.Editor editor = preferences.edit();
+ editor.putString("Name", "valid_data");
+ //Log.d(TAG, "UIDValidity set to in shared_prefs:"+UIDValidity);
+ editor.putLong("UIDValidity", UIDValidity);
+ editor.apply();
}
- }
-
- public static void GetNotes(Account account, Folder notesFolder, Context ctx, NotesDb storedNotes) throws MessagingException, IOException{
- Long UIDM;
- Message notesMessage;
- File directory = new File (ctx.getFilesDir() + "/" + account.name);
- if (notesFolder.isOpen()) {
- if ((notesFolder.getMode() & Folder.READ_ONLY) != 0)
- notesFolder.open(Folder.READ_ONLY);
- } else {
- notesFolder.open(Folder.READ_ONLY);
+ // Retrieve values from shared preferences:
+ static Long GetUIDValidity(@NonNull Account account,
+ @NonNull Context ctx) {
+ Log.d(TAG,"GetUIDValidity: " + account.name);
+ UIDValidity = (long) -1;
+ SharedPreferences preferences = ctx.getSharedPreferences(account.name, Context.MODE_MULTI_PROCESS);
+ String name = preferences.getString("Name", "");
+ if (!name.equalsIgnoreCase("")) {
+ UIDValidity = preferences.getLong("UIDValidity", -1);
+ //Log.d(TAG, "UIDValidity got from shared_prefs:"+UIDValidity);
+ }
+ return UIDValidity;
}
- UIDValidity = GetUIDValidity(account, ctx);
- SetUIDValidity(account, UIDValidity, ctx);
- Message[] notesMessages = notesFolder.getMessages();
- //Log.d(TAG,"number of messages in folder="+(notesMessages.length));
- for(int index=notesMessages.length-1; index>=0; index--) {
- notesMessage = notesMessages[index];
- // write every message in files/{accountname} directory
- // filename is the original message uid
- UIDM=((IMAPFolder)notesFolder).getUID(notesMessage);
- String suid = UIDM.toString();
- File outfile = new File (directory, suid);
- GetOneNote(outfile, notesMessage, storedNotes, account.name, suid, true);
+
+ static void DisconnectFromRemote() {
+ Log.d(TAG,"DisconnectFromRemote");
+ try {
+ store.close();
+ } catch (MessagingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
- }
-
- public static Sticky ReadStickynote(String stringres) {
- String color=new String("");
- String position=new String("");
- String text=new String("");
- Pattern p = null;
- Matcher m = null;
-
- p = Pattern.compile("^COLOR:(.*?)$",Pattern.MULTILINE);
- m = p.matcher(stringres);
- if (m.find()) { color = m.group(1); }
-
- p = Pattern.compile("^POSITION:(.*?)$",Pattern.MULTILINE);
- m = p.matcher(stringres);
- if (m.find()) { position = m.group(1); }
-
- p = Pattern.compile("TEXT:(.*?)(END:|POSITION:)",Pattern.DOTALL);
- m = p.matcher(stringres);
- if (m.find()) {
- text = m.group(1);
- // Kerio Connect puts CR+LF+space every 78 characters from line 2
- // first line seem to be smaller. We remove these characters
- text = text.replaceAll("\r\n ", "");
- // newline in Kerio is the string (not the character) "\n"
- text = text.replaceAll("\\\\n", "
");
+/*
+
+ */
+/**
+ * @param uid ID of the message as created by the IMAP server
+ * @param where TODO: what is this?
+ * @param removeMinus TODO: Why?
+ * @param nameDir Name of the account with which this message is associated, used to create the
+ * directory in which to store it.
+ * @return A Java mail message object.
+ *//*
+
+ @Nullable
+ public static Message ReadMailFromFile(@NonNull String uid,
+ Where where,
+ boolean removeMinus,
+ @NonNull String nameDir) {
+ File mailFile;
+ Message message = null;
+ mailFile = new File(nameDir, uid);
+
+ switch (where) {
+ case NEW:
+ nameDir = nameDir + "/new";
+ if (removeMinus) uid = uid.substring(1);
+ break;
+ case DELETED:
+ nameDir = nameDir + "/deleted";
+ break;
+ case ROOT_AND_NEW:
+ if (!mailFile.exists()) {
+ nameDir = nameDir + "/new";
+ if (removeMinus) uid = uid.substring(1);
+ }
+ break;
+ default:
+ throw new UnsupportedOperationException("Unrecognized value for where argument: " + where);
+ }
+
+ mailFile = new File(nameDir, uid);
+ InputStream mailFileInputStream = null;
+ try {
+ mailFileInputStream = new FileInputStream(mailFile);
+ } catch (FileNotFoundException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ try {
+ Properties props = new Properties();
+ Session session = Session.getDefaultInstance(props, null);
+ message = new MimeMessage(session, mailFileInputStream);
+ } catch (MessagingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return message;
}
- return new Sticky(text, position, color);
- }
-
- public static boolean IsConnected(){
- return store!=null && store.isConnected();
- }
-
- public static void DeleteNote(Folder notesFolder, int numMessage) throws MessagingException, IOException {
- notesFolder = store.getFolder(sfolder);
- if (notesFolder.isOpen()) {
- if ((notesFolder.getMode() & Folder.READ_WRITE) != 0)
- notesFolder.open(Folder.READ_WRITE);
- } else {
- notesFolder.open(Folder.READ_WRITE);
+*/
+
+ /**
+ * @param uid ID of the message as created by the IMAP server
+ * @param newFilesDir Directory in which it is stored.
+ * @return A Java mail message object.
+ */
+ @Nullable
+ static Message ReadMailFromFileNew(@NonNull String uid,
+ @NonNull File newFilesDir) {
+ Log.d(TAG,"ReadMailFromFileNew");
+ //File mailFile;
+ //Message message = null;
+ //mailFile = new File(nameDir, uid);
+
+ return ReadMailFromFile(newFilesDir, uid);
}
-
- //Log.d(TAG,"UID to remove:"+numMessage);
- Message[] msgs = {((IMAPFolder)notesFolder).getMessageByUID(numMessage)};
- notesFolder.setFlags(msgs, new Flags(Flags.Flag.DELETED), true);
- ((IMAPFolder)notesFolder).expunge(msgs);
- }
-
- // Put values in shared preferences
- public static void SetUIDValidity(Account account, Long UIDValidity, Context ctx) {
- SharedPreferences preferences = ctx.getSharedPreferences(account.name, Context.MODE_MULTI_PROCESS);
- SharedPreferences.Editor editor = preferences.edit();
- editor.putString("Name","valid_data");
- //Log.d(TAG, "UIDValidity set to in shared_prefs:"+UIDValidity);
- editor.putLong("UIDValidity", UIDValidity);
- editor.apply();
- }
-
- // Retrieve values from shared preferences:
- public static Long GetUIDValidity(Account account, Context ctx) {
- UIDValidity = (long) -1;
- SharedPreferences preferences = ctx.getSharedPreferences(account.name, Context.MODE_MULTI_PROCESS);
- String name = preferences.getString("Name", "");
- if(!name.equalsIgnoreCase("")) {
- UIDValidity = preferences.getLong("UIDValidity", -1);
- //Log.d(TAG, "UIDValidity got from shared_prefs:"+UIDValidity);
+
+ /**
+ * @param uid ID of the message as created by the IMAP server
+ * @param fileDir Name of the account with which this message is associated, used to find the
+ * directory in which it is stored.
+ * @return A Java mail message object.
+ */
+ @Nullable
+ public static Message ReadMailFromFileRootAndNew(@NonNull String uid,
+ @NonNull File fileDir) {
+ Log.d(TAG,"ReadMailFromFileRootAndNew: " + fileDir.getPath() + " " + uid);
+ //File mailFile;
+ //Message message = null;
+ File mailFile = new File(fileDir, uid);
+
+ if (!mailFile.exists()) {
+ fileDir = new File(fileDir, "new");
+ uid = uid.substring(1);
+ }
+
+ return ReadMailFromFile(fileDir, uid);
}
- return UIDValidity;
- }
-
- public static void DisconnectFromRemote() {
- try {
- store.close();
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+
+// --Commented out by Inspection START (11/26/16 11:46 PM):
+// /**
+// * @param uid ID of the message as created by the IMAP server
+// * @param nameDir Name of the account with which this message is associated, used to find the
+// * directory in which it is stored.
+// * @return A Java mail message object.
+// */
+// @Nullable
+// public static Message ReadMailFromFileDeleted(@NonNull String uid,
+// @NonNull String nameDir) {
+// return ReadMailFromFile(new File(nameDir, "deleted"), uid);
+// }
+// --Commented out by Inspection STOP (11/26/16 11:46 PM)
+
+
+ /**
+ * @param uid ID of the message as created by the IMAP server
+ * @param nameDir Name of the account with which this message is associated, used to find the
+ * directory in which it is stored.
+ * @return A Java mail message object.
+ */
+ @Nullable
+ private static Message ReadMailFromFile(@NonNull File nameDir,
+ @NonNull String uid) {
+ Log.d(TAG,"ReadMailFromFile: " + nameDir.getPath() + " " + uid);
+ File mailFile = new File(nameDir, uid);
+
+ try (InputStream mailFileInputStream = new FileInputStream(mailFile)) {
+ try {
+ Properties props = new Properties();
+ Session session = Session.getDefaultInstance(props, null);
+ Log.d(TAG, "ReadMailFromFile return new MimeMessage.");
+ return new MimeMessage(session, mailFileInputStream);
+ } catch (MessagingException e) {
+ // TODO Auto-generated catch block
+ Log.d(TAG, "Exception getting MimeMessage.");
+ e.printStackTrace();
+ }
+ } catch (FileNotFoundException e1) {
+ // TODO Auto-generated catch block
+ Log.d(TAG, "File not found opening mailFile: " + mailFile.getAbsolutePath());
+ e1.printStackTrace();
+ } catch (IOException exIO) {
+ //TODO: handle this properly
+ Log.d(TAG, "IO exception opening mailFile: " + mailFile.getAbsolutePath());
+ exIO.printStackTrace();
+ }
+ Log.d(TAG,"ReadMailFromFile return null.");
+ return null;
}
- }
-
- public static Message ReadMailFromFile (String uid, int where, boolean removeMinus, String nameDir) {
- File mailFile;
- Message message = null;
- mailFile = new File (nameDir,uid);
-
- switch (where){
- case NEW:
- nameDir = nameDir + "/new";
- if (removeMinus) uid = uid.substring(1);
- break;
- case DELETED:
- nameDir = nameDir + "/deleted";
- break;
- case ROOT_AND_NEW:
- if (!mailFile.exists()) {
- nameDir = nameDir + "/new";
- if (removeMinus) uid = uid.substring(1);
- }
- break;
- default:
- break;
- }
-
- mailFile = new File (nameDir,uid);
- InputStream mailFileInputStream = null;
- try {
- mailFileInputStream = new FileInputStream(mailFile);
- } catch (FileNotFoundException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- try {
- Properties props = new Properties();
- Session session = Session.getDefaultInstance(props, null);
- message = new MimeMessage(session, mailFileInputStream);
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return message;
- }
-
- public static AppendUID[] sendMessageToRemote (Message[] message) throws MessagingException, IOException {
- notesFolder = store.getFolder(sfolder);
- if (notesFolder.isOpen()) {
- if ((notesFolder.getMode() & Folder.READ_WRITE) != 0)
- notesFolder.open(Folder.READ_WRITE);
- } else {
- notesFolder.open(Folder.READ_WRITE);
+
+ static AppendUID[] sendMessageToRemote(@NonNull Message[] message) throws MessagingException {
+ notesFolder = store.getFolder(sfolder);
+ if (notesFolder.isOpen()) {
+ if ((notesFolder.getMode() & Folder.READ_WRITE) != 0)
+ notesFolder.open(Folder.READ_WRITE);
+ } else {
+ notesFolder.open(Folder.READ_WRITE);
+ }
+ return ((IMAPFolder) notesFolder).appendUIDMessages(message);
}
- AppendUID[] uids = ((IMAPFolder) notesFolder).appendUIDMessages(message);
- return uids;
- }
-
- public static void ClearHomeDir(Account account, Context ctx) {
- File directory = new File (ctx.getFilesDir() + "/" + account.name);
- try {
- FileUtils.deleteDirectory(directory);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+
+// --Commented out by Inspection START (12/3/16 11:31 PM):
+// static void ClearHomeDir(@NonNull Account account, @NonNull Context ctx) {
+// File directory = new File(ctx.getFilesDir() + "/" + account.name);
+// try {
+// FileUtils.deleteDirectory(directory);
+// } catch (IOException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// }
+// --Commented out by Inspection STOP (12/3/16 11:31 PM)
+
+ /**
+ * Do we really need the Context argument or could we call getApplicationContext instead?
+ *
+ * @param accountName Name of the account as defined by the user, this is not the email address.
+ * @param applicationContext Global context not an activity context.
+ */
+ @SuppressWarnings("ResultOfMethodCallIgnored")
+ public static void CreateLocalDirectories(@NonNull String accountName, @NonNull Context applicationContext) {
+ Log.d(TAG, "CreateDirs(String: " + accountName);
+ File dir = new File(applicationContext.getFilesDir(), accountName);
+ //File directory = new File(stringDir);
+ //directory.mkdirs();
+ (new File(dir, "new")).mkdirs();
+ (new File(dir, "deleted")).mkdirs();
}
- }
-
- public static void CreateDirs (String accountName, Context ctx) {
- String stringDir = ctx.getFilesDir() + "/" + accountName;
- File directory = new File (stringDir);
- directory.mkdirs();
- directory = new File (stringDir + "/new");
- directory.mkdirs();
- directory = new File (stringDir + "/deleted");
- directory.mkdirs();
- }
-
- public static void GetOneNote(File outfile, Message notesMessage, NotesDb storedNotes, String accountName, String suid, boolean updateDb) {
- OutputStream str=null;
-
- try {
- str = new FileOutputStream(outfile);
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- try {
- notesMessage.writeTo(str);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- if (!(updateDb)) return;
-
- String title = null;
- String[] rawvalue = null;
- // Some servers (such as posteo.de) don't encode non us-ascii characters in subject
- // This is a workaround to handle them
- // "lä ö ë" subject should be stored as =?charset?encoding?encoded-text?=
- // either =?utf-8?B?bMOkIMO2IMOr?= -> Quoted printable
- // or =?utf-8?Q?l=C3=A4 =C3=B6 =C3=AB?= -> Base64
- try { rawvalue = notesMessage.getHeader("Subject"); } catch (Exception e) {e.printStackTrace(); };
- try { title = notesMessage.getSubject(); } catch (Exception e) {e.printStackTrace();}
- if (rawvalue[0].length() >= 2) {
- if (!(rawvalue[0].substring(0,2).equals("=?"))) {
- try { title = new String ( title.getBytes("ISO-8859-1")); } catch (Exception e) {e.printStackTrace();}
- }
- } else {
- try { title = new String ( title.getBytes("ISO-8859-1")); } catch (Exception e) {e.printStackTrace();}
- }
-
- // Get INTERNALDATE
- String internaldate = null;
- Date MessageInternaldate = null;
- try {
- MessageInternaldate = notesMessage.getReceivedDate();
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- String DATE_FORMAT = "yyyy-MM-dd HH:MM:ss";
- SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
- internaldate = sdf.format(MessageInternaldate);
-
- OneNote aNote = new OneNote(
- title,
- internaldate,
- suid);
- storedNotes.InsertANoteInDb(aNote, accountName);
- }
-
- public static boolean handleRemoteNotes (Context context, Folder notesFolder, NotesDb storedNotes, String accountName, String usesticky)
- throws MessagingException, IOException {
-
- Message notesMessage;
- boolean result = false;
- ArrayList