From c5bb7d065f5fe7fa96b080b8465c0aba32e25b65 Mon Sep 17 00:00:00 2001 From: tateisu Date: Fri, 28 Apr 2017 17:14:24 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=81=AE=E9=96=8B=E7=99=BA=E8=80=85=E3=83=AA=E3=83=B3=E3=82=AF?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=92=E6=94=B9=E5=96=84=E3=80=82?= =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E6=99=82=E3=81=AB=E9=8D=B5=E4=BB=98=E3=81=8D=E3=82=A2=E3=82=AB?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=88=E3=81=AA=E3=82=89=E5=85=AC=E9=96=8B?= =?UTF-8?q?=E7=AF=84=E5=9B=B2=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E3=82=92=E9=9D=9E=E5=85=AC=E9=96=8B=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=80=82=E6=8A=95=E7=A8=BF=E7=94=BB=E9=9D=A2=E3=81=A7?= =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E5=88=87=E3=82=8A?= =?UTF-8?q?=E6=9B=BF=E3=81=88=E6=99=82=E3=81=AB=E3=80=81=E5=85=AC=E9=96=8B?= =?UTF-8?q?=E7=AF=84=E5=9B=B2=E3=82=92=E9=81=A9=E5=BA=A6=E3=81=AB=E7=8B=AD?= =?UTF-8?q?=E3=82=81=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/juggler/subwaytooter/ActAbout.java | 2 +- .../java/jp/juggler/subwaytooter/ActMain.java | 12 ++++++----- .../java/jp/juggler/subwaytooter/ActPost.java | 20 ++++++++++++++----- app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAbout.java b/app/src/main/java/jp/juggler/subwaytooter/ActAbout.java index 3ed6849f..29b7face 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAbout.java +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAbout.java @@ -33,7 +33,7 @@ public class ActAbout extends AppCompatActivity { Button b; b = (Button) findViewById( R.id.btnDeveloper ); - b.setText( developer_acct ); + b.setText( getString(R.string.search_for,developer_acct )); b.setOnClickListener( new View.OnClickListener() { @Override public void onClick( View v ){ Intent data = new Intent(); diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.java b/app/src/main/java/jp/juggler/subwaytooter/ActMain.java index 93b006b4..84f48092 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.java +++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.java @@ -604,8 +604,13 @@ public class ActMain extends AppCompatActivity this.row_id = SavedAccount.insert( host, user, result.object, result.token_info ); SavedAccount account = SavedAccount.loadAccount( log, row_id ); if( account != null ){ + if( account.locked ){ + account.visibility = TootStatus.VISIBILITY_PRIVATE; + account.saveSetting(); + } + Utils.showToast(ActMain. this, false, R.string.account_confirmed ); AlarmService.startCheck( ActMain.this ); - onAccountUpdated( account ); + addColumn( account, Column.TYPE_HOME ); } } } @@ -683,10 +688,7 @@ public class ActMain extends AppCompatActivity return col; } - private void onAccountUpdated( SavedAccount data ){ - Utils.showToast( this, false, R.string.account_confirmed ); - addColumn( data, Column.TYPE_HOME ); - } + void performOpenUser( SavedAccount access_info, TootAccount user ){ addColumn( access_info, Column.TYPE_PROFILE, user.id ); diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.java b/app/src/main/java/jp/juggler/subwaytooter/ActPost.java index c51500bd..232ce5ac 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.java +++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.java @@ -10,7 +10,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.provider.OpenableColumns; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.support.v4.os.AsyncTaskCompat; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; @@ -286,12 +285,13 @@ public class ActPost extends AppCompatActivity implements View.OnClickListener { } if( this.account == null ){ + // 表示を未選択に更新 setAccount( null ); } updateContentWarning(); showMediaAttachment(); - updateVisibility(); + showVisibility(); updateTextCount(); showReplyTo(); } @@ -456,7 +456,17 @@ public class ActPost extends AppCompatActivity implements View.OnClickListener { @Override public void onClick( DialogInterface dialog, int which ){ if( which >= 0 && which < tmp_account_list.size() ){ - setAccount( tmp_account_list.get( which ) ); + SavedAccount account =tmp_account_list.get( which ); + setAccount( account ); + try{ + if( account.visibility != null && TootStatus.compareVisibility( visibility, account.visibility ) > 0 ){ + Utils.showToast( ActPost.this, true, R.string.spoil_visibility_for_account ); + visibility = account.visibility; + showVisibility(); + } + }catch(Throwable ex){ + ex.printStackTrace( ); + } } } } ) @@ -704,7 +714,7 @@ public class ActPost extends AppCompatActivity implements View.OnClickListener { String visibility; - private void updateVisibility(){ + private void showVisibility(){ btnVisibility.setImageResource( Styler.getVisibilityIcon( this, visibility ) ); } @@ -735,7 +745,7 @@ public class ActPost extends AppCompatActivity implements View.OnClickListener { visibility = TootStatus.VISIBILITY_DIRECT; break; } - updateVisibility(); + showVisibility(); } } ) .setNegativeButton( R.string.cancel, null ) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d6b6d3ba..59dfbb4c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -180,4 +180,6 @@ 正規表現フィルタ(上級者向け) ユーザへの通知データがタンスのサーバから削除されます。よろしいですか？ 通知の削除 + %1$s を検索 + 公開範囲をアカウントの既定値に狭めました diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 74dc3b5d..1147837b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -179,4 +179,6 @@ regex error delete notification your notification data on instance sarver will be deleted. Are you sure? + search %1$s + visivility is spoiled for account.