LucasGGamerM
e2c62aa76b
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/values/dimens.xml
2023-06-09 18:09:23 -03:00
sk
cd46ed565f
open browser if login redirects to website
2023-06-07 21:11:20 +02:00
sk
4258c55b88
implement fetching listings from remote instances
2023-06-06 17:04:29 +02:00
sk
4673a4b9f7
add missing database column in post notification table
2023-06-05 11:22:01 +02:00
Grishka
d4a5286895
Fix #553
2023-06-04 23:47:08 +02:00
sk
b102deaee1
don't let interaction counts go negative
2023-06-04 19:08:18 +02:00
LucasGGamerM
14175a9140
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/item_account_switcher.xml
# mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-pt-rPT/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/styles.xml
2023-06-03 19:56:16 -03:00
sk
f241092277
use isInstanceAkkoma()
2023-06-01 19:22:01 +02:00
sk
0702703d78
normalize instance uri
2023-06-01 19:13:03 +02:00
sk
41cb0f2e09
implement assist url in instance rules
2023-06-01 18:38:45 +02:00
sk
b2d6879282
reimplement assist content
2023-06-01 18:02:33 +02:00
sk
02f9f8c8ea
always update active account, but not others
2023-05-31 12:23:04 +02:00
sk
0985a4c968
getInstance returns optional
2023-05-30 18:57:17 +02:00
sk
8df589c103
safer file writing
2023-05-30 18:56:55 +02:00
sk
32081b71f5
throw exception if no instance for session
2023-05-29 13:31:42 +02:00
sk
3a2ae1ce71
clean up preferences when removing account
2023-05-29 02:40:15 +02:00
sk
c80afaf9c0
avoid sessions without instance info
2023-05-29 02:40:02 +02:00
sk
31d22bac47
remove unused method
2023-05-29 02:38:52 +02:00
Jacoco
b5f6687925
More Akkoma improvements ( #524 )
...
* Only open account if domain matches
Akkoma will seemingly show results that don't match well. This checks if the domain matches before continuing
* Add "RE:" for quotes where it's missing
* Fix no hashtag history in search
* Skip not implemented discovery and select search on Pleroma
* Set proper max account fields for Pleroma
* Use Pleroma's non-standard poll limits
* Mark notifications as read properly on Pleroma
* Akkoma bubble timeline
* Respect Reply Visibility preference on all timelines
* vertically center if hashtag has no history
* only open account search result if uri equals
* add getInstance and isPleroma methods
* change timelines api, support compatibility checks
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-05-29 02:37:46 +02:00
LucasGGamerM
c6ded3d505
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/res/layout/display_item_file.xml
2023-05-27 09:31:27 -03:00
sk
99f0817bdb
generalize filtering logic
2023-05-26 02:07:50 +02:00
sk
a7ebadf269
increase read timeout
...
re: sk22#392
2023-05-25 15:11:40 +02:00
sk
94c09d46c2
fix contentType being a required field
...
re: sk22#516
2023-05-25 14:53:26 +02:00
LucasGGamerM
889fbc688d
fix: removes @RequiredField for contentType
...
Removes that, as its null on mastodon, and makes editing statuses impossible
2023-05-25 11:45:32 +00:00
LucasGGamerM
23f82197c6
Merge pull request #200
...
Feat: Instance info
2023-05-23 20:08:36 -03:00
LucasGGamerM
b4b16e2f37
feat: use Moshidon user agent instead of Megalodon's
2023-05-23 19:49:34 -03:00
LucasGGamerM
65c158391f
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/res/layout/fragment_compose.xml
2023-05-23 19:30:52 -03:00
FineFindus
f482b4bfe9
feat: add weekly activities api request
2023-05-23 18:43:24 +02:00
sk
f6f08d176c
change user-agent string
2023-05-23 10:26:48 +02:00
FineFindus
56835b4f2d
feat: show blocked domains
2023-05-22 21:37:56 +02:00
sk
66cdd63496
use fedinuke block list
...
closes sk22#511
2023-05-22 18:04:37 +02:00
Jacoco
8b502b605c
Alternative content types ( #516 )
...
* Akkoma content types
* Default content type preference
* per-account content types, compatible with glitch
* disable content types by default, change icon
* persist content type to state
* update string
* fall back to plain text if formatting enabled
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-05-22 17:56:50 +02:00
FineFindus
64fc052c55
feat: show extended description in info
2023-05-22 14:52:04 +02:00
LucasGGamerM
ac2e7cde41
chore: remove unused files
...
Idk how it got there, but its now gone :D
2023-05-14 14:39:39 -03:00
LucasGGamerM
7020018bb7
fix: fixes remote attachments pointing to unexistent file in local server
...
This fixes broken links to file attachments from calckey accounts on mastodon instances
2023-05-13 21:29:59 -03:00
LucasGGamerM
5b391b44d3
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/github/AndroidManifest.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-eu-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/es/changelogs/83.txt
# metadata/fr/short_description.txt
# metadata/gl-ES/changelogs/83.txt
2023-04-22 13:53:50 -03:00
sk
4d7c4aed4c
enable nonTransitiveRClass
2023-04-22 16:51:44 +02:00
FineFindus
a59587eb62
fix(auth): use BuildType depended redirect uri
2023-04-09 15:46:30 +02:00
FineFindus
7615723d4f
refactor(auth): use REDIRECT_URI
2023-04-09 15:07:22 +02:00
LucasGGamerM
0589612df9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
Jacoco
132b672441
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-21 20:01:47 -03:00
sk
ffb7cc5c18
don't remove badge if loaded from cache
2023-03-21 19:55:34 -03:00
sk
5395855775
feat: implement notification badge using markers from @sk22.
...
Thank you a lot man! This improvement is amazing
2023-03-21 19:55:34 -03:00
sk
0216e22fcc
don't remove badge if loaded from cache
2023-03-21 15:25:01 +01:00
sk
ff272179e7
implement notification badge using markers
2023-03-21 00:52:20 +01:00
sk
6734c2b9f7
add null check for source object
...
closes sk22#460
2023-03-20 14:22:46 +01:00
sk
b667afc7cd
some barebones calckey compatibility
...
re: sk22#429
2023-03-17 02:30:21 +01:00
Jacoco
f852dac1e5
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-16 00:49:11 +01:00
LucasGGamerM
811304c0c7
fix: login with some pleroma instances. Fixes #114
2023-03-11 19:47:29 -03:00
FineFindus
4152179dea
fix(request/mute): add correct body on unmute
2023-03-06 22:00:49 +01:00
