Browse Source
Merge pull request #755 from MeLlamoPablo/fix/emojis-in-stories
Fix emojis being url-encoded when replying to stories
renovate/org.robolectric-robolectric-4.x
Austin Huang
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
13 deletions
-
app/src/main/java/awais/instagrabber/repositories/requests/directmessages/StoryReplyBroadcastOptions.java
-
app/src/main/java/awais/instagrabber/utils/TextUtils.java
|
@ -17,7 +17,7 @@ public class StoryReplyBroadcastOptions extends BroadcastOptions { |
|
|
final String reelId) |
|
|
final String reelId) |
|
|
throws UnsupportedEncodingException { |
|
|
throws UnsupportedEncodingException { |
|
|
super(clientContext, threadIdOrUserIds, BroadcastItemType.REELSHARE); |
|
|
super(clientContext, threadIdOrUserIds, BroadcastItemType.REELSHARE); |
|
|
this.text = TextUtils.encode(text); |
|
|
|
|
|
|
|
|
this.text = text; |
|
|
this.mediaId = mediaId; |
|
|
this.mediaId = mediaId; |
|
|
this.reelId = reelId; // or user id, usually same |
|
|
this.reelId = reelId; // or user id, usually same |
|
|
} |
|
|
} |
|
|
|
@ -104,18 +104,6 @@ public final class TextUtils { |
|
|
return (int) ((d2 - d1) / DateUtils.DAY_IN_MILLIS); |
|
|
return (int) ((d2 - d1) / DateUtils.DAY_IN_MILLIS); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@NonNull |
|
|
|
|
|
public static String encode(final String text) throws UnsupportedEncodingException { |
|
|
|
|
|
return URLEncoder.encode(text, "UTF-8") |
|
|
|
|
|
.replaceAll("\\+", "%20") |
|
|
|
|
|
.replaceAll("%21", "!") |
|
|
|
|
|
.replaceAll("%27", "'") |
|
|
|
|
|
.replaceAll("%28", "(") |
|
|
|
|
|
.replaceAll("%29", ")") |
|
|
|
|
|
.replaceAll("%7E", "~") |
|
|
|
|
|
.replaceAll("%0A", "\n"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static List<String> extractUrls(final String text) { |
|
|
public static List<String> extractUrls(final String text) { |
|
|
if (isEmpty(text)) return Collections.emptyList(); |
|
|
if (isEmpty(text)) return Collections.emptyList(); |
|
|
final Matcher matcher = Patterns.WEB_URL.matcher(text); |
|
|
final Matcher matcher = Patterns.WEB_URL.matcher(text); |
|
|