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.