Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix 

updated Tagger
This commit is contained in:
nuclearfog 2020-02-22 15:27:16 +01:00
parent a03eea1f85
commit 26ba02d0f0
No known key found for this signature in database
GPG Key ID: ED35E22099354A64
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -44,5 +44,5 @@ dependencies {
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'com.github.QuadFlask:colorpicker:0.0.13'
implementation 'com.github.nuclearfog:ZoomView:1.0.2'
implementation 'com.github.nuclearfog:Tagger:2.0'
implementation 'com.github.nuclearfog:Tagger:2.1'
}

4
app/src/main/java/org/nuclearfog/twidda/activity/TweetDetail.java
View File

@ -55,6 +55,7 @@ import static android.os.AsyncTask.Status.RUNNING;
import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.MotionEvent.ACTION_UP;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_SHORT;
import static org.nuclearfog.twidda.activity.MediaViewer.KEY_MEDIA_LINK;
@ -376,6 +377,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
StringTools.FileType ext = StringTools.getFileType(links[0]);
switch (ext) {
case IMAGE:
videoButton.setVisibility(GONE);
imageButton.setVisibility(VISIBLE);
imageButton.setOnClickListener(new OnClickListener() {
@Override
@ -389,6 +391,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
break;
case VIDEO:
imageButton.setVisibility(GONE);
videoButton.setVisibility(VISIBLE);
videoButton.setOnClickListener(new OnClickListener() {
@Override
@ -402,6 +405,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
break;
case STREAM:
imageButton.setVisibility(GONE);
videoButton.setVisibility(VISIBLE);
videoButton.setOnClickListener(new OnClickListener() {
@Override

16
app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java
View File

@ -350,6 +350,7 @@ public class AppDatabase {
statColumn.put("retweeterID", tweet.getMyRetweetId());
statColumn.put("replyname", tweet.getReplyName());
statColumn.put("statusregister", register);
statColumn.put("media", getMediaLinks(tweet));
TwitterUser user = tweet.getUser();
userColumn.put("username", user.getUsername());
@ -645,12 +646,7 @@ public class AppDatabase {
statusRegister &= ~RTW_MASK;
}
StringBuilder media = new StringBuilder();
for (String link : tweet.getMediaLinks()) {
media.append(link);
media.append(";");
}
status.put("media", media.toString());
status.put("media", getMediaLinks(tweet));
status.put("statusregister", statusRegister);
status.put("tweetID", tweet.getId());
status.put("userID", user.getId());
@ -793,4 +789,12 @@ public class AppDatabase {
} while (index > 0);
return links.toArray(new String[0]);
}
private String getMediaLinks(Tweet tweet) {
StringBuilder media = new StringBuilder();
for (String link : tweet.getMediaLinks())
media.append(link).append(";");
return media.toString();
}
}