Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-02-09 08:38:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
NudeDude 2018-09-16 14:15:37 +02:00
parent 805e67fcbd
commit e15c85351c
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
View File

@ -102,7 +102,7 @@ public class StatusUpload extends AsyncTask<String, Void, Boolean> {
.setPositiveButton(R.string.retry, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ui.get().send();
ui.get().findViewById(R.id.sendTweet).callOnClick();
}
})
.setNegativeButton(R.string.cancel, null).show();

29
app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
View File

@ -14,6 +14,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.ImagePopup;
@ -116,7 +117,18 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener {
public void onClick(View v) {
switch (v.getId()) {
case R.id.sendTweet:
send();
String tweetStr = tweet.getText().toString();
sendTweet = new StatusUpload(this, tweetStr, inReplyId);
if (!tweetStr.trim().isEmpty() && mediaPath.isEmpty()) {
sendTweet.execute();
} else if (!mediaPath.isEmpty()) {
String[] paths = new String[mediaPath.size()];
paths = mediaPath.toArray(paths);
sendTweet.execute(paths);
} else {
Toast.makeText(this, R.string.empty_tweet, Toast.LENGTH_SHORT).show();
}
break;
case R.id.close:
@ -154,21 +166,6 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener {
}
public void send() {
String tweetStr = tweet.getText().toString();
String[] paths = new String[mediaPath.size()];
paths = mediaPath.toArray(paths);
sendTweet = new StatusUpload(this, tweetStr, inReplyId);
if (!tweetStr.trim().isEmpty() || paths.length > 0) {
if (inReplyId > 0) {
sendTweet.execute(paths);
} else {
sendTweet.execute();
}
}
}
private void getMedia() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
int check = checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE);

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

@ -67,4 +67,5 @@
<string name="cancel_message">Nachricht verwerfen?</string>
<string name="error_not_specified">Allgemeiner Fehler!</string>
<string name="error_sending_dm">Fehler beim Senden der Direktnachricht!</string>
<string name="empty_tweet">Tweet leer!</string>
</resources>

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

@ -75,4 +75,5 @@
<string name="cancel_message">cancel message?</string>
<string name="error_not_specified">not specidfied error!</string>
<string name="error_sending_dm">error while sending direct message!</string>
<string name="empty_tweet">empty tweet!</string>
</resources>