Lomanic
/
BarInsta
mirror of https://github.com/KokaKiwi/BarInsta
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/task/update-feed-view' into task/update-feed-view

This commit is contained in:
Ammar Githam 2020-09-09 00:55:39 +09:00
parent 149410d552 26b4d9d650
commit 8b2ac8de3b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
View File

@ -289,8 +289,11 @@ public class DirectMessageThreadFragment extends Fragment {
} }
} else if (which == 1) { } else if (which == 1) {
sendText(null, directItemModel.getItemId(), directItemModel.isLiked()); sendText(null, directItemModel.getItemId(), directItemModel.isLiked());
} else if (which == 2) { }
if (String.valueOf(directItemModel.getUserId()).equals(myId)) else if (which == 2) {
if (directItemModel == null)
Toast.makeText(requireContext(), R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
else if (String.valueOf(directItemModel.getUserId()).equals(myId))
new ThreadAction().execute("delete", directItemModel.getItemId()); new ThreadAction().execute("delete", directItemModel.getItemId());
else searchUsername(getUser(directItemModel.getUserId()).getUsername()); else searchUsername(getUser(directItemModel.getUserId()).getUsername());
} }

5
app/src/main/java/awais/instagrabber/utils/Utils.java
View File

@ -168,6 +168,7 @@ public final class Utils {
return null; return null;
} }
@NonNull @NonNull
public static CharSequence getMentionText(@NonNull final CharSequence text) { public static CharSequence getMentionText(@NonNull final CharSequence text) {
final int commentLength = text.length(); final int commentLength = text.length();
@ -1326,7 +1327,7 @@ public final class Utils {
"org.telegram.messenger", "org.telegram.messenger",
"org.thunderdog.challegram", "org.thunderdog.challegram",
"ir.ilmili.telegraph", "ir.ilmili.telegraph",
"org.telegram.BifToGram", // "org.telegram.BifToGram", see GitHub issue 124
"org.vidogram.messenger", "org.vidogram.messenger",
"com.xplus.messenger", "com.xplus.messenger",
"com.ellipi.messenger", "com.ellipi.messenger",
@ -1434,4 +1435,4 @@ public final class Utils {
} }
return r; return r;
} }
} }