Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

ミュート操作時に「通知もミュート」するか選べる(マストドン2.1以降)

This commit is contained in:
tateisu 2017-12-07 19:15:57 +09:00
parent 700f3ca5a9
commit d2ac776a5a
6 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "jp.juggler.subwaytooter"
minSdkVersion 21
targetSdkVersion 26
versionCode 177
versionName "1.7.7"
versionCode 178
versionName "1.7.8"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

65
app/src/main/java/jp/juggler/subwaytooter/ActMain.java
View File

@ -1817,7 +1817,6 @@ public class ActMain extends AppCompatActivity
Utils.showToast( ActMain.this, false, R.string.app_was_muted );
}
//////////////////////////////////////////////////////////////
interface FindAccountCallback {
@ -3645,6 +3644,7 @@ public class ActMain extends AppCompatActivity
@NonNull final SavedAccount access_info
, @NonNull final TootAccount who
, final boolean bMute
, final boolean bMuteNotification
, @Nullable final RelationChangedCallback callback
){
@ -3668,16 +3668,15 @@ public class ActMain extends AppCompatActivity
client.setAccount( access_info );
Request.Builder request_builder = new Request.Builder().post(
RequestBody.create(
TootApiClient.MEDIA_TYPE_FORM_URL_ENCODED
, "" // 空データ
) );
! bMute ? RequestBody.create( TootApiClient.MEDIA_TYPE_FORM_URL_ENCODED, "" )
: bMuteNotification ? RequestBody.create( TootApiClient.MEDIA_TYPE_JSON, "{\"notifications\": true}" )
: RequestBody.create( TootApiClient.MEDIA_TYPE_JSON, "{\"notifications\": false}" )
);
TootApiResult result = client.request( "/api/v1/accounts/" + who.id + ( bMute ? "/mute" : "/unmute" )
, request_builder );
if( result != null ){
if( result.object != null ){
relation = saveUserRelation( access_info, TootRelationShip.parse( result.object ) );
}
if( result != null && result.object != null ){
relation = saveUserRelation( access_info, TootRelationShip.parse( result.object ) );
}
return result;
}
@ -4057,11 +4056,11 @@ public class ActMain extends AppCompatActivity
client.setAccount( access_info );
JSONObject content = new JSONObject( );
JSONObject content = new JSONObject();
try{
content.put( "reblogs", bShow);
}catch(Throwable ex){
return new TootApiResult( Utils.formatError( ex,"json encoding error" ) );
content.put( "reblogs", bShow );
}catch( Throwable ex ){
return new TootApiResult( Utils.formatError( ex, "json encoding error" ) );
}
Request.Builder request_builder = new Request.Builder().post(
@ -4070,14 +4069,14 @@ public class ActMain extends AppCompatActivity
, content.toString()
) );
TootApiResult result =client.request( "/api/v1/accounts/"+who.id+"/follow", request_builder );
if( result !=null && result.object != null ){
TootApiResult result = client.request( "/api/v1/accounts/" + who.id + "/follow", request_builder );
if( result != null && result.object != null ){
relation = TootRelationShip.parse( result.object );
}
return result;
}
TootRelationShip relation ;
TootRelationShip relation;
@Override protected void onCancelled( TootApiResult result ){
super.onPostExecute( result );
@ -4088,7 +4087,7 @@ public class ActMain extends AppCompatActivity
if( result == null ){
// cancelled.
}else if( relation != null ){
saveUserRelation( access_info,relation );
saveUserRelation( access_info, relation );
Utils.showToast( ActMain.this, true, R.string.operation_succeeded );
}else{
Utils.showToast( ActMain.this, true, result.error );
@ -4888,17 +4887,18 @@ public class ActMain extends AppCompatActivity
@Override public boolean isApiCancelled(){
return isCancelled();
}
@Override public void publishApiProgress( String s ){
}
} );
client.setAccount( access_info );
JSONObject content = new JSONObject( );
JSONObject content = new JSONObject();
try{
content.put("title",title);
}catch(Throwable ex){
return new TootApiResult( Utils.formatError( ex,"can't encoding json parameter." ) );
content.put( "title", title );
}catch( Throwable ex ){
return new TootApiResult( Utils.formatError( ex, "can't encoding json parameter." ) );
}
Request.Builder request_builder = new Request.Builder().post(
@ -4907,8 +4907,7 @@ public class ActMain extends AppCompatActivity
, content.toString()
) );
TootApiResult result = client.request( "/api/v1/lists" , request_builder );
TootApiResult result = client.request( "/api/v1/lists", request_builder );
if( result != null ){
if( result.object != null ){
@ -4938,7 +4937,7 @@ public class ActMain extends AppCompatActivity
column.onListListUpdated( access_info );
}
Utils.showToast(ActMain.this, false, R.string.list_created);
Utils.showToast( ActMain.this, false, R.string.list_created );
}else{
Utils.showToast( ActMain.this, false, result.error );
@ -4955,6 +4954,7 @@ public class ActMain extends AppCompatActivity
@Override public boolean isApiCancelled(){
return isCancelled();
}
@Override public void publishApiProgress( String s ){
}
} );
@ -4963,12 +4963,11 @@ public class ActMain extends AppCompatActivity
Request.Builder request_builder = new Request.Builder().delete();
TootApiResult result = client.request( "/api/v1/lists/"+ list_id , request_builder );
TootApiResult result = client.request( "/api/v1/lists/" + list_id, request_builder );
return result;
}
@Override
protected void onCancelled( TootApiResult result ){
onPostExecute( null );
@ -4985,7 +4984,7 @@ public class ActMain extends AppCompatActivity
column.onListListUpdated( access_info );
}
Utils.showToast(ActMain.this, false, R.string.delete_succeeded );
Utils.showToast( ActMain.this, false, R.string.delete_succeeded );
}else{
Utils.showToast( ActMain.this, false, result.error );
@ -4994,7 +4993,7 @@ public class ActMain extends AppCompatActivity
}.executeOnExecutor( App1.task_executor );
}
public void callDeleteListMember( @NonNull final SavedAccount access_info, @NonNull final TootAccount who ,final long list_id ){
public void callDeleteListMember( @NonNull final SavedAccount access_info, @NonNull final TootAccount who, final long list_id ){
new AsyncTask< Void, Void, TootApiResult >() {
@Override protected TootApiResult doInBackground( Void... params ){
@ -5002,6 +5001,7 @@ public class ActMain extends AppCompatActivity
@Override public boolean isApiCancelled(){
return isCancelled();
}
@Override public void publishApiProgress( String s ){
}
} );
@ -5010,12 +5010,11 @@ public class ActMain extends AppCompatActivity
Request.Builder request_builder = new Request.Builder().delete();
TootApiResult result = client.request( "/api/v1/lists/"+list_id+"/accounts?account_ids[]="+ who.id , request_builder );
TootApiResult result = client.request( "/api/v1/lists/" + list_id + "/accounts?account_ids[]=" + who.id, request_builder );
return result;
}
@Override
protected void onCancelled( TootApiResult result ){
onPostExecute( null );
@ -5029,10 +5028,10 @@ public class ActMain extends AppCompatActivity
}else if( result.object != null ){
for( Column column : app_state.column_list ){
column.onListMemberUpdated( access_info ,list_id,who,false);
column.onListMemberUpdated( access_info, list_id, who, false );
}
Utils.showToast(ActMain.this, false, R.string.delete_succeeded );
Utils.showToast( ActMain.this, false, R.string.delete_succeeded );
}else{
Utils.showToast( ActMain.this, false, result.error );

15
app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.java
View File

@ -12,7 +12,9 @@ import android.text.TextUtils;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.TextView;
import java.util.ArrayList;
@ -435,14 +437,21 @@ class DlgContextMenu implements View.OnClickListener, View.OnLongClickListener {
if( who == null ){
// サーバのバグで誰のことか分からないので何もできない
}else if( relation.muting ){
activity.callMute( access_info, who, false, null );
activity.callMute( access_info, who, false,false, null );
}else{
View view = activity.getLayoutInflater().inflate( R.layout.dlg_confirm,null,false );
TextView tvMessage = view.findViewById( R.id.tvMessage );
tvMessage.setText( activity.getString( R.string.confirm_mute_user, who.username ) );
final CheckBox cbMuteNotification = view.findViewById( R.id.cbSkipNext );
cbMuteNotification.setText( R.string.confirm_mute_notification_for_user );
cbMuteNotification.setChecked( true );
new AlertDialog.Builder( activity )
.setMessage( activity.getString( R.string.confirm_mute_user, who.username ) )
.setView( view )
.setNegativeButton( R.string.cancel, null )
.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() {
@Override public void onClick( DialogInterface dialog, int which ){
activity.callMute( access_info, who, true, null );
activity.callMute( access_info, who, true,cbMuteNotification.isChecked(), null );
}
} )
.show();

1
app/src/main/res/values-fr/strings.xml
View File

@ -557,6 +557,7 @@
<string name="cant_add_list_follow_requesting">Can\'t add user to list:\nPlease wait until the follow request is approved.</string>
<string name="cant_add_list_follow_failed">Can\'t add user to list:\nfollow operation failed.</string>
<string name="list_member_added">User has been added to the list.</string>
<string name="confirm_mute_notification_for_user">Mute notification from this user</string>
<!--<string name="abc_action_bar_home_description">Revenir à l\'accueil</string>-->
<!--<string name="abc_action_bar_home_description_format">%1$s, %2$s</string>-->

1
app/src/main/res/values-ja/strings.xml
View File

@ -844,4 +844,5 @@
<string name="cant_add_list_follow_requesting">リストに追加できません:\nフォローリクエストが承認されるのを待ってください</string>
<string name="cant_add_list_follow_failed">リストに追加できません:\nフォロー操作に失敗しました</string>
<string name="list_member_added">追加できました</string>
<string name="confirm_mute_notification_for_user">Mute notification from this user</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -548,4 +548,5 @@
<string name="cant_add_list_follow_requesting">Can\'t add user to list:\nPlease wait until the follow request is approved.</string>
<string name="cant_add_list_follow_failed">Can\'t add user to list:\nfollow operation failed.</string>
<string name="list_member_added">User has been added to the list.</string>
<string name="confirm_mute_notification_for_user">Mute notification from this user</string>
</resources>