v1.0.1

- 投稿画面で返信表示を２回HTMLデコードしていたバグを修正。過去に作成した下書きの表示が少し乱れるかもしれない
- トゥート検索カラムでも添付データや正規表現フィルタを使える
- 疑似アカウントだと「～のタイムラインを開く」を利用できなかったバグを修正
- トゥート検索の時刻表記UTCから端末タイムゾーンに変換
- アカウントのdisplay_nameに改行が含まれる場合に改行しないようにした

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "jp.juggler.subwaytooter"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 100
+        versionCode 101
-        versionName "1.0.0"
+        versionName "1.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/java/jp/juggler/subwaytooter/ActMain.java

@@ -3779,7 +3779,7 @@ public class ActMain extends AppCompatActivity
 			}
 			
 		}else{
-			AccountPicker.pick( this, false, false
+			AccountPicker.pick( this, true, false
 				, getString( R.string.account_picker_add_timeline_of, host )
 				, account_list, new AccountPicker.AccountPickerCallback() {
 					@Override public void onAccountPicked( @NonNull SavedAccount ai ){

app/src/main/java/jp/juggler/subwaytooter/ActPost.java

@@ -443,7 +443,7 @@ public class ActPost extends AppCompatActivity implements View.OnClickListener,
 					
 					// リプライ表示をつける
 					in_reply_to_id = reply_status.id;
-					in_reply_to_text = reply_status.decoded_content.toString();
+					in_reply_to_text = reply_status.content;
 					in_reply_to_image = reply_status.account == null ? null : reply_status.account.avatar_static;
 					in_reply_to_url = reply_status.url;
 					

app/src/main/java/jp/juggler/subwaytooter/ActText.java

@@ -55,13 +55,7 @@ public class ActText extends AppCompatActivity implements View.OnClickListener {
 		
 		addHeader( context,sb, R.string.send_header_url, status.url );
 		
-		if( status instanceof  TootStatus ){
+		addHeader( context,sb, R.string.send_header_date,TootStatus.formatTime( status.time_created_at ) );
-			TootStatus ts = (TootStatus)status;
-			addHeader( context,sb, R.string.send_header_date,TootStatus.formatTime( ts.time_created_at ) );
-		}else if( status instanceof MSPToot ){
-			MSPToot ts = (MSPToot)status;
-			addHeader( context,sb, R.string.send_header_date, ts.created_at  );
-		}
 		
 		if( status.account != null ){
 			addHeader( context,sb, R.string.send_header_from_acct, access_info.getFullAcct( status.account ) );

app/src/main/java/jp/juggler/subwaytooter/Column.java

@@ -25,7 +25,6 @@ import java.util.regex.Pattern;
 import jp.juggler.subwaytooter.api.TootApiClient;
 import jp.juggler.subwaytooter.api.TootApiResult;
 import jp.juggler.subwaytooter.api.entity.TootAccount;
-import jp.juggler.subwaytooter.api.entity.TootAttachment;
 import jp.juggler.subwaytooter.api.entity.TootContext;
 import jp.juggler.subwaytooter.api.entity.TootDomainBlock;
 import jp.juggler.subwaytooter.api.entity.TootGap;
@@ -35,7 +34,6 @@ import jp.juggler.subwaytooter.api.entity.TootReport;
 import jp.juggler.subwaytooter.api.entity.TootResults;
 import jp.juggler.subwaytooter.api.entity.TootStatus;
 import jp.juggler.subwaytooter.api.entity.TootTag;
-import jp.juggler.subwaytooter.api_msp.MSPApiResult;
 import jp.juggler.subwaytooter.api_msp.MSPClient;
 import jp.juggler.subwaytooter.api_msp.entity.MSPToot;
 import jp.juggler.subwaytooter.table.AcctColor;
@@ -757,6 +755,39 @@ class Column implements StreamReader.Callback {
 		AlarmService.dataRemoved( context, access_info.db_id );
 	}
 	
+	void removeMuteApp(){
+		ArrayList< Object > tmp_list = new ArrayList<>( list_data.size() );
+		
+		HashSet< String > muted_app = MutedApp.getNameSet();
+		WordTrieTree muted_word = MutedWord.getNameSet();
+		
+		for( Object o : list_data ){
+			if( o instanceof TootStatus ){
+				TootStatus item = (TootStatus) o;
+				if( item.checkMuted( muted_app, muted_word ) ){
+					continue;
+					
+				}
+			}
+			if( o instanceof TootNotification ){
+				TootNotification item = (TootNotification) o;
+				TootStatus status = item.status;
+				
+				if( status != null ){
+					if( status.checkMuted( muted_app, muted_word ) ){
+						continue;
+					}
+				}
+			}
+			tmp_list.add( o );
+		}
+		if( tmp_list.size() != list_data.size() ){
+			list_data.clear();
+			list_data.addAll( tmp_list );
+			fireShowContent();
+		}
+	}
+	
 	void onDomainBlockChanged( SavedAccount target_account, String domain, boolean bBlocked ){
 		if( ! target_account.host.equals( access_info.host ) ) return;
 		if( access_info.isPseudo() ) return;
@@ -898,13 +929,7 @@ class Column implements StreamReader.Callback {
 	final BucketList< Object > list_data = new BucketList<>();
 	private final DuplicateMap duplicate_map = new DuplicateMap();
 	
-	private static boolean hasMedia( TootStatus status ){
+	private boolean isFilterEnabled(){
-		if( status == null ) return false;
-		TootAttachment.List list = status.media_attachments;
-		return ! ( list == null || list.isEmpty() );
-	}
-	
-	private boolean isFiltered(){
 		return ( with_attachment
 			|| dont_show_boost
 			|| dont_show_reply
@@ -912,39 +937,6 @@ class Column implements StreamReader.Callback {
 		);
 	}
 	
-	void removeMuteApp(){
-		ArrayList< Object > tmp_list = new ArrayList<>( list_data.size() );
-		
-		HashSet< String > muted_app = MutedApp.getNameSet();
-		WordTrieTree muted_word = MutedWord.getNameSet();
-		
-		for( Object o : list_data ){
-			if( o instanceof TootStatus ){
-				TootStatus item = (TootStatus) o;
-				if( item.checkMuted( muted_app, muted_word ) ){
-					continue;
-					
-				}
-			}
-			if( o instanceof TootNotification ){
-				TootNotification item = (TootNotification) o;
-				TootStatus status = item.status;
-				
-				if( status != null ){
-					if( status.checkMuted( muted_app, muted_word ) ){
-						continue;
-					}
-				}
-			}
-			tmp_list.add( o );
-		}
-		if( tmp_list.size() != list_data.size() ){
-			list_data.clear();
-			list_data.addAll( tmp_list );
-			fireShowContent();
-		}
-	}
-	
 	private Pattern column_regex_filter;
 	private HashSet< String > muted_app;
 	private WordTrieTree muted_word;
@@ -963,9 +955,10 @@ class Column implements StreamReader.Callback {
 		muted_word = MutedWord.getNameSet();
 	}
 	
-	private boolean isFiltered( TootStatus status ){
+	private boolean isFiltered( @NonNull TootStatus status ){
 		if( with_attachment ){
-			if( ! hasMedia( status ) && ! hasMedia( status.reblog ) ) return true;
+			boolean hasMedia = status.reblog != null ? status.reblog.hasMedia() : status.hasMedia();
+			if( ! hasMedia ) return true;
 		}
 		
 		if( dont_show_boost ){
@@ -996,6 +989,33 @@ class Column implements StreamReader.Callback {
 		return false;
 	}
 	
+	private boolean isFiltered( MSPToot status ){
+		if( with_attachment ){
+			boolean hasMedia = status.hasMedia();
+			if( ! hasMedia ) return true;
+		}
+		
+		if( dont_show_boost ){
+			// MSPToot には関連パラメータはない
+		}
+		
+		if( dont_show_reply ){
+			// MSPToot には関連パラメータはない
+		}
+		
+		if( column_regex_filter != null ){
+			if( column_regex_filter.matcher( status.decoded_content.toString() ).find() )
+				return true;
+		}
+		
+		//noinspection RedundantIfStatement
+		if( status.checkMuted( muted_app, muted_word ) ){
+			return true;
+		}
+		
+		return false;
+	}
+	
 	@SuppressWarnings("ConstantConditions")
 	private void addWithFilter( ArrayList< Object > dst, TootStatus.List src ){
 		for( TootStatus status : src ){
@@ -1005,6 +1025,15 @@ class Column implements StreamReader.Callback {
 		}
 	}
 	
+	@SuppressWarnings("ConstantConditions")
+	private void addWithFilter( ArrayList< Object > dst, MSPToot.List src ){
+		for( MSPToot status : src ){
+			if( ! isFiltered( status ) ){
+				dst.add( status );
+			}
+		}
+	}
+	
 	private boolean isFiltered( TootNotification item ){
 		
 		TootStatus status = item.status;
@@ -1074,7 +1103,7 @@ class Column implements StreamReader.Callback {
 							log.d( "loading-statuses: cancelled." );
 							break;
 						}
-						if( ! isFiltered() ){
+						if( ! isFilterEnabled() ){
 							log.d( "loading-statuses: isFiltered is false." );
 							break;
 						}
@@ -1334,7 +1363,7 @@ class Column implements StreamReader.Callback {
 								MSPToot.List search_result = MSPToot.parseList( log, access_info, result.array );
 								if( search_result != null ){
 									list_tmp = new ArrayList<>();
-									list_tmp.addAll( search_result );
+									addWithFilter( list_tmp, search_result );
 								}
 							}
 						}
@@ -1908,7 +1937,7 @@ class Column implements StreamReader.Callback {
 							}
 							
 							// bottomの場合、フィルタなしなら繰り返さない
-							if( ! isFiltered() ){
+							if( ! isFilterEnabled() ){
 								log.d( "refresh-status-bottom: isFiltered is false." );
 								break;
 							}
@@ -2134,7 +2163,7 @@ class Column implements StreamReader.Callback {
 								MSPToot.List search_result = MSPToot.parseList( log, access_info, result.array );
 								if( search_result != null ){
 									list_tmp = new ArrayList<>();
-									list_tmp.addAll( search_result );
+									addWithFilter( list_tmp, search_result );
 								}
 							}
 						}

app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java

@@ -256,7 +256,6 @@ class ColumnViewHolder
 				bAllowFilter = true;
 				break;
 			case Column.TYPE_SEARCH:
-			case Column.TYPE_SEARCH_PORTAL:
 			case Column.TYPE_CONVERSATION:
 			case Column.TYPE_REPORTS:
 			case Column.TYPE_BLOCKS:
@@ -295,15 +294,17 @@ class ColumnViewHolder
 			cbResolve.setChecked( column.search_resolve );
 			
 			vg( cbWithAttachment, bAllowFilter );
+			vg( etRegexFilter, bAllowFilter );
+			vg( llRegexFilter, bAllowFilter );
+
 			vg( cbDontShowBoost, bAllowFilterBoost );
 			vg( cbDontShowReply, bAllowFilterBoost );
+
 			vg( cbDontStreaming, column.canStreaming() );
 			vg( cbDontAutoRefresh, column.canAutoRefresh() );
 			vg( cbHideMediaDefault, column.canShowMedia() );
 			vg( cbEnableSpeech, column.canSpeech() );
 			
-			vg( etRegexFilter, bAllowFilter );
-			vg( llRegexFilter, bAllowFilter );
 			
 			vg( btnDeleteNotification, column.column_type == Column.TYPE_NOTIFICATIONS );
 			vg( llSearch, (column.column_type == Column.TYPE_SEARCH  || column.column_type == Column.TYPE_SEARCH_PORTAL ) );

app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.java

@@ -3,6 +3,7 @@ package jp.juggler.subwaytooter;
 import android.content.DialogInterface;
 import android.graphics.Typeface;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
@@ -79,7 +80,7 @@ class ItemViewHolder implements View.OnClickListener, View.OnLongClickListener {
 	private final View llSearchTag;
 	private final Button btnSearchTag;
 	
-	private final TextView tvApplication;
+	private @Nullable final TextView tvApplication;
 	
 	private TootStatusLike status;
 	private TootAccount account_thumbnail;
@@ -343,13 +344,8 @@ class ItemViewHolder implements View.OnClickListener, View.OnLongClickListener {
 		this.status = status;
 		llStatus.setVisibility( View.VISIBLE );
 		
-		if( status instanceof TootStatus ){
+		tvTime.setText( TootStatus.formatTime( status .time_created_at ) );
-			tvTime.setText( TootStatus.formatTime( ( (TootStatus) status ).time_created_at ) );
 
-		}else if( status instanceof MSPToot ){
-			tvTime.setText( ( (MSPToot) status ).created_at );
-			
-		}
 		ivThumbnail.setCornerRadius( activity.pref, 16f );
 		
 		account_thumbnail = status.account;

app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.java

@@ -10,6 +10,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.regex.Pattern;
 
 import jp.juggler.subwaytooter.util.HTMLDecoder;
 import jp.juggler.subwaytooter.util.LinkClickContext;
@@ -146,14 +147,18 @@ public class TootAccount {
 		return result;
 	}
 	
-	public static CharSequence filterDisplayName( String sv ){
+	static final Pattern reLineFeed = Pattern.compile( "[\\s\\t\\x0d\\x0a]+" );
 	
+	public static CharSequence filterDisplayName( String sv ){
 		// decode HTML entity
 		sv = HTMLDecoder.decodeEntity( sv );
 		
 		// sanitize LRO,RLO
 		sv = Utils.sanitizeBDI( sv );
 		
+		// remove white spaces
+		sv = reLineFeed.matcher( sv ).replaceAll( " " );
+		
 		// decode emoji code
 		return Emojione.decodeEmoji( sv );
 	}

app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.java

@@ -1,8 +1,6 @@
 package jp.juggler.subwaytooter.api.entity;
 
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.NavigationView;
 import android.text.Spannable;
 import android.text.TextUtils;
 
@@ -20,7 +18,6 @@ import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jp.juggler.subwaytooter.table.SavedAccount;
 import jp.juggler.subwaytooter.util.HTMLDecoder;
 import jp.juggler.subwaytooter.util.LinkClickContext;
 import jp.juggler.subwaytooter.util.LogCategory;
@@ -46,9 +43,6 @@ public class TootStatus extends TootStatusLike {
 	// A Fediverse-unique resource ID
 	public String uri;
 	
-
-	
-
 	//	null or the ID of the status it replies to
 	public String in_reply_to_id;
 	
@@ -59,9 +53,7 @@ public class TootStatus extends TootStatusLike {
 	public TootStatus reblog;
 	
 	//	The time the status was created
-	public String created_at;
+	private String created_at;
-	
-
 	
 	//One of: public, unlisted, private, direct
 	public String visibility;
@@ -79,9 +71,6 @@ public class TootStatus extends TootStatusLike {
 	//An array of Tags
 	public TootTag.List tags;
 	
-
-	public long time_created_at;
-	
 	// public Spannable decoded_tags;
 	public Spannable decoded_mentions;
 	
@@ -245,4 +234,7 @@ public class TootStatus extends TootStatusLike {
 		
 	}
 	
+	public boolean hasMedia(){
+		return media_attachments != null && media_attachments.size() > 0;
+	}
 }

app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatusLike.java

@@ -41,5 +41,7 @@ public abstract class TootStatusLike extends TootId{
 	//Application from which the status was posted
 	public TootApplication application;
 	
+	public long time_created_at;
 	
+	public abstract boolean hasMedia();
 }

app/src/main/java/jp/juggler/subwaytooter/api_msp/entity/MSPToot.java

@@ -1,20 +1,29 @@
 package jp.juggler.subwaytooter.api_msp.entity;
 
+import android.net.Uri;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import jp.juggler.subwaytooter.api.entity.TootAccount;
+import jp.juggler.subwaytooter.api.entity.TootAttachment;
+import jp.juggler.subwaytooter.api.entity.TootStatus;
 import jp.juggler.subwaytooter.api.entity.TootStatusLike;
 import jp.juggler.subwaytooter.table.SavedAccount;
 import jp.juggler.subwaytooter.util.HTMLDecoder;
 import jp.juggler.subwaytooter.util.LogCategory;
 import jp.juggler.subwaytooter.util.Utils;
+import jp.juggler.subwaytooter.util.WordTrieTree;
 
 public class MSPToot extends TootStatusLike {
 	
@@ -24,7 +33,6 @@ public class MSPToot extends TootStatusLike {
 	
 	private static final Pattern reAccountUrl = Pattern.compile( "\\Ahttps://([^/#?]+)/@([^/#?]+)\\z" );
 	
-	
 	private static TootAccount parseAccount( LogCategory log, SavedAccount access_info, JSONObject src ){
 		
 		if( src == null ) return null;
@@ -46,7 +54,6 @@ public class MSPToot extends TootStatusLike {
 		dst.note = Utils.optStringX( src, "note" );
 		dst.decoded_note = HTMLDecoder.decodeHTML( access_info, ( dst.note != null ? dst.note : null ), true, null );
 		
-		
 		if( TextUtils.isEmpty( dst.url ) ){
 			log.e( "parseAccount: missing url" );
 			return null;
@@ -93,7 +100,8 @@ public class MSPToot extends TootStatusLike {
 	//		return 0L;
 	//	}
 	
-	public String created_at;
+	private String created_at;
+	
 	public ArrayList< String > media_attachments;
 	public long msp_id;
 	
@@ -117,6 +125,7 @@ public class MSPToot extends TootStatusLike {
 		}
 		
 		dst.created_at = Utils.optStringX( src, "created_at" );
+		dst.time_created_at = parseTime( log, dst.created_at );
 		
 		JSONArray a = src.optJSONArray( "media_attachments" );
 		if( a != null && a.length() > 0 ){
@@ -143,7 +152,6 @@ public class MSPToot extends TootStatusLike {
 		return dst;
 	}
 	
-	
 	public static List parseList( LogCategory log, SavedAccount access_info, JSONArray array ){
 		List list = new List();
 		for( int i = 0, ie = array.length() ; i < ie ; ++ i ){
@@ -156,7 +164,66 @@ public class MSPToot extends TootStatusLike {
 		return list;
 	}
 	
+	private static final Pattern reTime = Pattern.compile( "\\A(\\d+)\\D+(\\d+)\\D+(\\d+)\\D+(\\d+)\\D+(\\d+)\\D+(\\d+)" );
 	
+	private static final TimeZone tz_utc = TimeZone.getTimeZone( "UTC" );
 	
+	static long parseTime( LogCategory log, String strTime ){
+		if( ! TextUtils.isEmpty( strTime ) ){
+			try{
+				Matcher m = reTime.matcher( strTime );
+				if( ! m.find() ){
+					log.d( "!!invalid time format: %s", strTime );
+				}else{
+					GregorianCalendar g = new GregorianCalendar( tz_utc );
+					g.set(
+						Utils.parse_int( m.group( 1 ), 1 ),
+						Utils.parse_int( m.group( 2 ), 1 ) - 1,
+						Utils.parse_int( m.group( 3 ), 1 ),
+						Utils.parse_int( m.group( 4 ), 0 ),
+						Utils.parse_int( m.group( 5 ), 0 ),
+						Utils.parse_int( m.group( 6 ), 0 )
+					);
+					g.set( Calendar.MILLISECOND, 500 );
+					return g.getTimeInMillis();
+				}
+			}catch( Throwable ex ){// ParseException,  ArrayIndexOutOfBoundsException
+				ex.printStackTrace();
+				log.e( ex, "TootStatus.parseTime failed. src=%s", strTime );
+			}
+		}
+		return 0L;
+	}
+	
+	public boolean checkMuted( @NonNull HashSet< String > muted_app, @NonNull WordTrieTree muted_word ){
+		
+		//		// app mute
+		//		if( application != null ){
+		//			String name = application.name;
+		//			if( name != null ){
+		//				if( muted_app.contains( name ) ){
+		//					return true;
+		//				}
+		//			}
+		//		}
+		//
+		// word mute
+		if( decoded_content != null && muted_word.containsWord( decoded_content.toString() ) ){
+			return true;
+		}
+		
+		if( decoded_spoiler_text != null && muted_word.containsWord( decoded_spoiler_text.toString() ) ){
+			return true;
+		}
+		
+		//		// reblog
+		//		return reblog != null && reblog.checkMuted( muted_app, muted_word );
+		
+		return false;
 		
 	}
+	
+	public boolean hasMedia(){
+		return media_attachments != null && media_attachments.size() > 0;
+	}
+}

app/src/main/java/jp/juggler/subwaytooter/util/HTMLDecoder.java

@@ -88,8 +88,6 @@ public class HTMLDecoder {
 		}
 	}
 	
-
-
 	private static final boolean DEBUG_HTML_PARSER = false;
 	
 	private static class Node {
@@ -311,7 +309,6 @@ public class HTMLDecoder {
 			if( end > start ){
 				MyClickableSpan span = new MyClickableSpan( account, item.url, account.findAcctColor( item.url ) );
 				
-				
 				sb.setSpan( span, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE );
 			}
 		}