Support markdown text format

.travis.yml

@@ -1,5 +1,6 @@
 language: android
 sudo: false
+dist: precise
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -26,19 +27,23 @@ android:
     - extra-android-support
     - extra-google-m2repository
     - extra-android-m2repository
+    - android-23
     # emulator(s)
-    - android-22
-    - sys-img-armeabi-v7a-android-22
+    - sys-img-armeabi-v7a-android-21
+
   licenses:
     - 'android-sdk-preview-license-52d11cd2'
-#    - 'android-sdk-license-5be876d5'
     - 'android-sdk-license-c81a61d9'
 #    - 'android-googletv-license-99eda7fb'
     - 'google-gdk-license-9529f459'
+    #for emulator
+    - 'android-sdk-license-5be876d5'
+    - 'android-sdk-license-2742d1c5'
 
 before_script:
   # Emulator Management: Create, Start and Wait
-  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - android list targets
+  - echo no | android create avd --force -n test -t android-10 --abi armeabi -c 32M
   - emulator -avd test -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &

OpenRedmine/OpenRedmine.iml

@@ -89,7 +89,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -99,7 +98,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />

OpenRedmine/src/main/java/jp/redmine/redmineclient/db/store/DatabaseHelper.java

@@ -14,7 +14,7 @@
 
 public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	private static String DB_NAME="OpenRedmine.db";
-	private static int DB_VERSION=1;
+	private static int DB_VERSION=2;
 
     public DatabaseHelper(Context context) {
     	super(context, DB_NAME, null, DB_VERSION);
@@ -31,9 +31,23 @@ public void onCreate(SQLiteDatabase arg0, ConnectionSource arg1) {
 	}
 
 	@Override
-	public void onUpgrade(SQLiteDatabase arg0, ConnectionSource arg1, int arg2,
-			int arg3) {
+	public void onUpgrade(SQLiteDatabase db, ConnectionSource source,  int older,int newer) {
 
+		switch (older) {
+			case 1:
+				addColumnNotNull(db, RedmineConnection.class, "text_type INTEGER", RedmineConnection.TEXT_TYPE_TEXTTILE);
+		}
+	}
+
+	private void addColumnNotNull(SQLiteDatabase db, Class<?> name, String column, int default_value){
+		db.execSQL("ALTER TABLE "
+				+ name.getSimpleName()
+				+ " ADD COLUMN "
+				+ column
+				+ " NOT NULL DEFAULT "
+				+ default_value
+				+ ";");
 	}
 
+
 }

OpenRedmine/src/main/java/jp/redmine/redmineclient/entity/RedmineConnection.java

@@ -3,10 +3,14 @@
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
+import jp.redmine.redmineclient.form.helper.WikiType;
+
 @DatabaseTable
 public class RedmineConnection {
 	public final static String ID = "id";
 	public final static String CONNECTION_ID = "connection_id";
+	public final static int TEXT_TYPE_TEXTTILE = 0;
+	public final static int TEXT_TYPE_MARKDOWN = 1;
     @DatabaseField(generatedId = true)
     private Integer id;
     @DatabaseField
@@ -27,138 +31,113 @@ public class RedmineConnection {
     private boolean permitunsafe;
     @DatabaseField
     private String certkey;
+	@DatabaseField
+	private int text_type;
 
     @Override
     public String toString(){
     	return name;
     }
 
     ////////////////////////////////////////////////////////
-    /**
-     * IDを設定
-     * @param id ID
-     */
+
 	public void setId(Integer id) {
 		this.id = id;
 	}
-	/**
-	 * IDを取得
-	 * @return ID
-	 */
+
 	public Integer getId() {
 		return id;
 	}
-	/**
-	 * @param name セットする 名称
-	 */
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	/**
-	 * @return name 名称
-	 */
+
 	public String getName() {
 		return name;
 	}
-	/**
-	 * @param url セットする url
-	 */
+
 	public void setUrl(String url) {
 		this.url = url;
 	}
-	/**
-	 * @return url
-	 */
+
 	public String getUrl() {
 		return url;
 	}
-	/**
-	 * @param nowarn セットする nowarn
-	 */
+
 	public void setNowarn(boolean nowarn) {
 		this.nowarn = nowarn;
 	}
-	/**
-	 * @return nowarn
-	 */
+
 	public boolean getNowarn() {
 		return nowarn;
 	}
-	/**
-	 * @param token セットする token
-	 */
+
 	public void setToken(String token) {
 		this.token = token;
 	}
-	/**
-	 * @return token
-	 */
+
 	public String getToken() {
 		return token;
 	}
-	/**
-	 * @param auth セットする auth
-	 */
+
 	public void setAuth(boolean auth) {
 		this.auth = auth;
 	}
-	/**
-	 * @return auth
-	 */
+
 	public boolean isAuth() {
 		return auth;
 	}
-	/**
-	 * @param authid セットする authid
-	 */
+
 	public void setAuthId(String authid) {
 		this.authid = authid;
 	}
-	/**
-	 * @return authid
-	 */
+
 	public String getAuthId() {
 		return authid;
 	}
-	/**
-	 * @param authpass セットする authpass
-	 */
+
 	public void setAuthPasswd(String authpass) {
 		this.authpass = authpass;
 	}
-	/**
-	 * @return authpass
-	 */
+
 	public String getAuthPasswd() {
 		return authpass;
 	}
 
-	/**
-	 * @param permitunsafe セットする permitunsafe
-	 */
 	public void setPermitUnsafe(boolean permitunsafe) {
 		this.permitunsafe = permitunsafe;
 	}
 
-	/**
-	 * @return permitunsafe
-	 */
 	public boolean isPermitUnsafe() {
 		return permitunsafe;
 	}
 
-	/**
-	 * @param certkey セットする certkey
-	 */
 	public void setCertKey(String certkey) {
 		this.certkey = certkey;
 	}
 
-	/**
-	 * @return certkey
-	 */
 	public String getCertKey() {
 		return certkey;
 	}
 
+
+	public int getTextType() {
+		return text_type;
+	}
+	public WikiType getWikiType() {
+		switch (text_type){
+			case TEXT_TYPE_TEXTTILE:
+				return WikiType.Texttile;
+			case TEXT_TYPE_MARKDOWN:
+				return WikiType.Markdown;
+			default:
+				return WikiType.None;
+		}
+	}
+
+	public void setTextType(int text_type) {
+		this.text_type = text_type;
+	}
+
 }

OpenRedmine/src/main/java/jp/redmine/redmineclient/form/helper/RedmineConvertToHtmlHelper.java

@@ -37,11 +37,6 @@ protected String pull(Anchor input) {
 		}
 
 	};
-	public enum WikiType{
-		Texttile,
-		Markdown,
-		None
-	}
 
 	public RedmineConvertToHtmlHelper(){
 		helpers.put(WikiType.Markdown, new MarkdownHelper());

OpenRedmine/src/main/java/jp/redmine/redmineclient/form/helper/TextViewHelper.java

@@ -26,7 +26,7 @@ public void setAction(WebviewActionInterface act){
 	}
 
 	public void setContent(TextView view, final int connectionid, final long project, final String text){
-		String content = converter.parse(text, RedmineConvertToHtmlHelper.WikiType.Texttile, connectionid, project);
+		String content = converter.parse(text, WikiType.Texttile, connectionid, project);
 		setTextViewHTML(view, content, new ClickLink() {
 			@Override
 			public void onClick(View view, URLSpan span) {

OpenRedmine/src/main/java/jp/redmine/redmineclient/form/helper/WebViewHelper.java

@@ -41,17 +41,13 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
 		});
 	}
 
-	public void setContent(WebView view, final int connectionid, final long project, final String text){
-		String inner = converter.parse(text, RedmineConvertToHtmlHelper.WikiType.Texttile, connectionid, project);
+	public void setContent(WebView view, WikiType type, final int connectionid, final long project, final String text){
+		String inner = converter.parse(text, type, connectionid, project);
 		view.loadDataWithBaseURL("", HtmlHelper.getHtml(view.getContext(),inner,""), "text/html", "UTF-8", "");
 	}
 
-	public void setContent(WebView view, String text){
-		String inner = converter.parse(text, RedmineConvertToHtmlHelper.WikiType.Texttile);
-		view.loadDataWithBaseURL("", HtmlHelper.getHtml(view.getContext(),inner,""), "text/html", "UTF-8", "");
-	}
-	public void setContentMarkdown(WebView view, String text){
-		String inner = converter.parse(text, RedmineConvertToHtmlHelper.WikiType.Markdown);
+	public void setContent(WebView view, String text, WikiType type){
+		String inner = converter.parse(text, type);
 		view.loadDataWithBaseURL("", HtmlHelper.getHtml(view.getContext(),inner,""), "text/html", "UTF-8", "");
 	}
 }

OpenRedmine/src/main/java/jp/redmine/redmineclient/form/helper/WikiType.java

@@ -0,0 +1,7 @@
+package jp.redmine.redmineclient.form.helper;
+
+public enum WikiType {
+	Texttile,
+	Markdown,
+	None
+}

OpenRedmine/src/main/java/jp/redmine/redmineclient/fragment/ProjectDetail.java

@@ -18,9 +18,12 @@
 import jp.redmine.redmineclient.activity.handler.WebviewActionInterface;
 import jp.redmine.redmineclient.db.cache.DatabaseCacheHelper;
 import jp.redmine.redmineclient.db.cache.RedmineProjectModel;
+import jp.redmine.redmineclient.db.store.RedmineConnectionModel;
+import jp.redmine.redmineclient.entity.RedmineConnection;
 import jp.redmine.redmineclient.entity.RedmineProject;
 import jp.redmine.redmineclient.fragment.form.ProjectForm;
 import jp.redmine.redmineclient.fragment.helper.ActivityHandler;
+import jp.redmine.redmineclient.model.ConnectionModel;
 import jp.redmine.redmineclient.param.ProjectArgument;
 import jp.redmine.redmineclient.param.WebArgument;
 
@@ -54,6 +57,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
 		intent.setArgument(getArguments());
 
 		RedmineProjectModel mProject = new RedmineProjectModel(getHelper());
+		RedmineConnection connection = ConnectionModel.getItem(getActivity(), intent.getConnectionId());
+
 		RedmineProject project = null;
 		try {
 			project = mProject.fetchById(intent.getProjectId());
@@ -63,7 +68,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
 		ProjectForm form = new ProjectForm(getView());
 		form.setupWebView(mListener);
-		form.setValue(project);
+		form.setValue(connection, project);
 	}
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

OpenRedmine/src/main/java/jp/redmine/redmineclient/fragment/ResourceMarkdown.java

@@ -18,6 +18,7 @@
 import jp.redmine.redmineclient.activity.handler.WebviewActionInterface;
 import jp.redmine.redmineclient.db.cache.DatabaseCacheHelper;
 import jp.redmine.redmineclient.form.helper.WebViewHelper;
+import jp.redmine.redmineclient.form.helper.WikiType;
 import jp.redmine.redmineclient.fragment.helper.ActivityHandler;
 import jp.redmine.redmineclient.param.ResourceArgument;
 
@@ -72,7 +73,7 @@ public void loadWebView(int resource) throws IOException {
 			text.append(str);
 			text.append("\n");
 		}
-		webViewHelper.setContentMarkdown(webView, text.toString());
+		webViewHelper.setContent(webView, text.toString(), WikiType.Markdown);
 	}
 
 	@Override

OpenRedmine/src/main/java/jp/redmine/redmineclient/fragment/WikiDetail.java

@@ -96,6 +96,7 @@ public void loadWebView(boolean isRefresh){
 		RedmineWikiModel model = new RedmineWikiModel(getHelper());
 		WikiArgument intent = new WikiArgument();
 		intent.setArgument(getArguments());
+		RedmineConnection connection = ConnectionModel.getItem(getActivity(), intent.getConnectionId());
 		try {
 			RedmineWiki wiki = model.fetchById(intent.getConnectionId(), intent.getProjectId(), intent.getWikiTitle());
 			if(!TextUtils.isEmpty(wiki.getTitle())){
@@ -114,7 +115,7 @@ public void loadWebView(boolean isRefresh){
 				}
 				content.append(wiki.getBody());
 			}
-			webViewHelper.setContent(webView, intent.getConnectionId(),intent.getProjectId(), content.toString());
+			webViewHelper.setContent(webView, connection.getWikiType(), intent.getConnectionId(),intent.getProjectId(), content.toString());
 		} catch (SQLException e) {
 			Log.e(TAG, "loadWebView", e);
 		}