Browse Source
Merge branch 'master' into task/update-feed-view
renovate/org.robolectric-robolectric-4.x
Austin Huang
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
4 deletions
-
app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
-
app/src/main/java/awais/instagrabber/utils/Utils.java
|
@ -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()); |
|
|
} |
|
|
} |
|
|
|
@ -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", |
|
|