bug fix
This commit is contained in:
parent
805e67fcbd
commit
e15c85351c
@ -102,7 +102,7 @@ public class StatusUpload extends AsyncTask<String, Void, Boolean> {
|
|||||||
.setPositiveButton(R.string.retry, new OnClickListener() {
|
.setPositiveButton(R.string.retry, new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
ui.get().send();
|
ui.get().findViewById(R.id.sendTweet).callOnClick();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.setNegativeButton(R.string.cancel, null).show();
|
.setNegativeButton(R.string.cancel, null).show();
|
||||||
|
@ -14,6 +14,7 @@ import android.view.View;
|
|||||||
import android.view.View.OnClickListener;
|
import android.view.View.OnClickListener;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.R;
|
import org.nuclearfog.twidda.R;
|
||||||
import org.nuclearfog.twidda.backend.ImagePopup;
|
import org.nuclearfog.twidda.backend.ImagePopup;
|
||||||
@ -116,7 +117,18 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener {
|
|||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.sendTweet:
|
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;
|
break;
|
||||||
|
|
||||||
case R.id.close:
|
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() {
|
private void getMedia() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
int check = checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
|
int check = checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
|
||||||
|
@ -67,4 +67,5 @@
|
|||||||
<string name="cancel_message">Nachricht verwerfen?</string>
|
<string name="cancel_message">Nachricht verwerfen?</string>
|
||||||
<string name="error_not_specified">Allgemeiner Fehler!</string>
|
<string name="error_not_specified">Allgemeiner Fehler!</string>
|
||||||
<string name="error_sending_dm">Fehler beim Senden der Direktnachricht!</string>
|
<string name="error_sending_dm">Fehler beim Senden der Direktnachricht!</string>
|
||||||
|
<string name="empty_tweet">Tweet leer!</string>
|
||||||
</resources>
|
</resources>
|
@ -75,4 +75,5 @@
|
|||||||
<string name="cancel_message">cancel message?</string>
|
<string name="cancel_message">cancel message?</string>
|
||||||
<string name="error_not_specified">not specidfied error!</string>
|
<string name="error_not_specified">not specidfied error!</string>
|
||||||
<string name="error_sending_dm">error while sending direct message!</string>
|
<string name="error_sending_dm">error while sending direct message!</string>
|
||||||
|
<string name="empty_tweet">empty tweet!</string>
|
||||||
</resources>
|
</resources>
|
Loading…
x
Reference in New Issue
Block a user