Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes issue #397 - Disable toot button when uploading media

This commit is contained in:
stom79 2018-04-16 07:54:22 +02:00
parent c10684b0aa
commit 570667159e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -343,6 +343,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
toot_picture_container.setVisibility(View.VISIBLE); toot_picture_container.setVisibility(View.VISIBLE);
picture_scrollview.setVisibility(View.VISIBLE); picture_scrollview.setVisibility(View.VISIBLE);
toot_picture.setEnabled(false); toot_picture.setEnabled(false);
toot_it.setEnabled(false);
new HttpsConnection(TootActivity.this).upload(bs, TootActivity.this); new HttpsConnection(TootActivity.this).upload(bs, TootActivity.this);
} }
toot_content.setText(String.format("\n\nvia @%s\n\n%s\n\n", tootMention, urlMention)); toot_content.setText(String.format("\n\nvia @%s\n\n%s\n\n", tootMention, urlMention));
@ -687,6 +688,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
e.printStackTrace(); e.printStackTrace();
Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show(); Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show();
toot_picture.setEnabled(true); toot_picture.setEnabled(true);
toot_it.setEnabled(true);
} }
} else { } else {
Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show(); Toast.makeText(getApplicationContext(), R.string.toot_select_image_error, Toast.LENGTH_LONG).show();
@ -780,6 +782,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show(); Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
toot_picture.setEnabled(true); toot_picture.setEnabled(true);
toot_it.setEnabled(true);
} }
}else if(requestCode == Helper.REQ_CODE_SPEECH_INPUT && resultCode == Activity.RESULT_OK){ }else if(requestCode == Helper.REQ_CODE_SPEECH_INPUT && resultCode == Activity.RESULT_OK){
if (null != data) { if (null != data) {
@ -847,12 +850,15 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
if( bs == null) if( bs == null)
return; return;
ImageButton toot_picture; ImageButton toot_picture;
Button toot_it;
LinearLayout toot_picture_container; LinearLayout toot_picture_container;
toot_picture = this.activityWeakReference.get().findViewById(R.id.toot_picture); toot_picture = this.activityWeakReference.get().findViewById(R.id.toot_picture);
toot_it = this.activityWeakReference.get().findViewById(R.id.toot_it);
toot_picture_container = this.activityWeakReference.get().findViewById(R.id.toot_picture_container); toot_picture_container = this.activityWeakReference.get().findViewById(R.id.toot_picture_container);
toot_picture_container.setVisibility(View.VISIBLE); toot_picture_container.setVisibility(View.VISIBLE);
toot_picture.setEnabled(false); toot_picture.setEnabled(false);
toot_it.setEnabled(false);
new HttpsConnection(this.activityWeakReference.get()).upload(bs, (TootActivity)this.activityWeakReference.get()); new HttpsConnection(this.activityWeakReference.get()).upload(bs, (TootActivity)this.activityWeakReference.get());
} }
} }
@ -1319,6 +1325,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
if( attachments.size() == 0 ) if( attachments.size() == 0 )
toot_picture_container.setVisibility(View.GONE); toot_picture_container.setVisibility(View.GONE);
toot_picture.setEnabled(true); toot_picture.setEnabled(true);
toot_it.setEnabled(true);
return; return;
} }
boolean alreadyAdded = false; boolean alreadyAdded = false;
@ -1387,6 +1394,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
attachments.add(attachment); attachments.add(attachment);
if (attachments.size() < 4) if (attachments.size() < 4)
toot_picture.setEnabled(true); toot_picture.setEnabled(true);
toot_it.setEnabled(true);
toot_sensitive.setVisibility(View.VISIBLE); toot_sensitive.setVisibility(View.VISIBLE);
picture_scrollview.setVisibility(View.VISIBLE); picture_scrollview.setVisibility(View.VISIBLE);
}else { }else {
@ -1407,6 +1415,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
ByteArrayInputStream bs = new ByteArrayInputStream(bitmapdata); ByteArrayInputStream bs = new ByteArrayInputStream(bitmapdata);
toot_picture_container.setVisibility(View.VISIBLE); toot_picture_container.setVisibility(View.VISIBLE);
toot_picture.setEnabled(false); toot_picture.setEnabled(false);
toot_it.setEnabled(false);
new HttpsConnection(TootActivity.this).upload(bs, TootActivity.this); new HttpsConnection(TootActivity.this).upload(bs, TootActivity.this);
} }
} }
@ -1681,7 +1690,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
toot_content.setText(newContent); toot_content.setText(newContent);
toot_space_left.setText(String.valueOf(toot_content.length())); toot_space_left.setText(String.valueOf(toot_content.length()));
toot_content.setSelection(newPosition); toot_content.setSelection(newPosition);
AccountsSearchAdapter accountsListAdapter = new AccountsSearchAdapter(TootActivity.this, new ArrayList<Account>()); AccountsSearchAdapter accountsListAdapter = new AccountsSearchAdapter(TootActivity.this, new ArrayList<>());
toot_content.setThreshold(1); toot_content.setThreshold(1);
toot_content.setAdapter(accountsListAdapter); toot_content.setAdapter(accountsListAdapter);
} }
@ -1732,7 +1741,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
toot_content.setText(newContent); toot_content.setText(newContent);
toot_space_left.setText(String.valueOf(toot_content.length())); toot_space_left.setText(String.valueOf(toot_content.length()));
toot_content.setSelection(newPosition); toot_content.setSelection(newPosition);
EmojisSearchAdapter emojisSearchAdapter = new EmojisSearchAdapter(TootActivity.this, new ArrayList<Emojis>()); EmojisSearchAdapter emojisSearchAdapter = new EmojisSearchAdapter(TootActivity.this, new ArrayList<>());
toot_content.setThreshold(1); toot_content.setThreshold(1);
toot_content.setAdapter(emojisSearchAdapter); toot_content.setAdapter(emojisSearchAdapter);
} }
@ -1782,7 +1791,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
toot_content.setText(newContent); toot_content.setText(newContent);
toot_space_left.setText(String.valueOf(toot_content.length())); toot_space_left.setText(String.valueOf(toot_content.length()));
toot_content.setSelection(newPosition); toot_content.setSelection(newPosition);
TagsSearchAdapter tagsSearchAdapter = new TagsSearchAdapter(TootActivity.this, new ArrayList<String>()); TagsSearchAdapter tagsSearchAdapter = new TagsSearchAdapter(TootActivity.this, new ArrayList<>());
toot_content.setThreshold(1); toot_content.setThreshold(1);
toot_content.setAdapter(tagsSearchAdapter); toot_content.setAdapter(tagsSearchAdapter);
} }