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
FineFindus
3619be71ab
feat: add mute timer
2023-03-06 21:55:32 +01:00
LucasGGamerM
8111ea04b9
fix: Profile lookups on custom local timelines now work
2023-02-22 17:21:33 -03:00
LucasGGamerM
ec0f6edc41
Merge branch 'main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# 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/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/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.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/displayitems/WarningFilteredStatusDisplayItem.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/layout/fragment_profile.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/values/strings.xml
2023-02-07 18:09:13 -03:00
LucasGGamerM
f07e0906dd
Merge branch 'main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.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/api/requests/notifications/DismissNotification.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/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.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/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.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/ColorPalette.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
# mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/header_welcome_custom.xml
# mastodon/src/main/res/layout/item_list_header_simple.xml
# mastodon/src/main/res/layout/item_settings_text.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/item_text.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/menu/color_palettes.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/menu/profile_own.xml
# mastodon/src/main/res/values-fr-rFR/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-ru-rRU/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/strings_sk.xml
# mastodon/src/main/res/values/styles.xml
# metadata/ca/changelogs/50.txt
# metadata/ca/changelogs/51.txt
# metadata/ca/full_description.txt
# metadata/de-DE/full_description.txt
# metadata/en-US/changelogs/50.txt
# metadata/en-US/changelogs/51.txt
# metadata/en-US/changelogs/56.txt
# metadata/en-US/full_description.txt
# metadata/en-US/images/phoneScreenshots/1.jpg
# metadata/en-US/images/phoneScreenshots/2.jpg
# metadata/en-US/images/phoneScreenshots/3.jpg
# metadata/en-US/images/phoneScreenshots/4.jpg
# metadata/en-US/images/phoneScreenshots/5.jpg
# metadata/en-US/images/phoneScreenshots/6.jpg
# metadata/en-US/short_description.txt
# metadata/en-US/title.txt
# metadata/es/changelogs/50.txt
# metadata/es/changelogs/51.txt
# metadata/es/full_description.txt
# metadata/fr-FR/full_description.txt
# metadata/gl-ES/short_description.txt
# metadata/gl-ES/title.txt
# metadata/id/full_description.txt
# metadata/nl-NL/short_description.txt
# metadata/nl-NL/title.txt
# metadata/pt-BR/full_description.txt
# metadata/sl/short_description.txt
# metadata/sl/title.txt
# metadata/sv/full_description.txt
2023-02-07 16:04:28 -03:00
sk
e282d54f99
Merge remote-tracking branch 'upstream/master'
2023-01-31 00:00:56 +01:00
sk
1af82fde61
implement local-only posting
2023-01-27 15:20:47 -03:00
sk22
b63c0010a9
Pinnable timelines ( #338 )
...
* implement draggable list
* implement pinning timelines
* fix TimelineDefinition equals not working
* implement removing timelines
* implement pinned lists/hashtags
* per-account pinned timelines
* implement pin button
* fix issues with pinning
* improve pin button
* improve pinning timelines
* implement custom icons
* fix home switcher menu
* make hashtags pinnable
* edit timelines in options menu
2023-01-27 14:32:04 -03:00
sk
2358d3c602
implement local-only posting
2023-01-24 16:04:17 +01:00
Grishka
c618feabe9
Workaround to fix #497
2023-01-23 17:19:34 -03:00
sk
ec40488ed1
Merge remote-tracking branch 'upstream/master'
2023-01-21 02:25:44 +01:00
sk22
88851a085e
Pinnable timelines ( #338 )
...
* implement draggable list
* implement pinning timelines
* fix TimelineDefinition equals not working
* implement removing timelines
* implement pinned lists/hashtags
* per-account pinned timelines
* implement pin button
* fix issues with pinning
* improve pin button
* improve pinning timelines
* implement custom icons
* fix home switcher menu
* make hashtags pinnable
* edit timelines in options menu
2023-01-21 02:17:47 +01:00
sk22
b7ccf1144c
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
Thanks @sk22!
2023-01-20 17:30:11 -03:00
LucasGGamerM
060745869b
Revert "New home layout with public timelines ( #288 )"
...
This reverts commit 78d0add808
2023-01-20 11:19:20 -03:00
sk22
78d0add808
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
2023-01-20 11:17:26 -03:00
Grishka
d06cf1bb1e
Paginate trending posts
2023-01-18 13:55:29 -03:00
sk
9f3bd186ba
improve domain check logic
2023-01-18 13:52:46 -03:00
sk
83b089457e
implement deleting lists
...
re: sk22#30
2023-01-18 13:34:54 -03:00
sk
ed9813f093
implement creating lists
...
re: sk22#30
2023-01-18 13:34:34 -03:00
mishnz
ff65d150e3
serverKey assignment was missing, corrected.
2023-01-18 13:23:23 -03:00
mishnz
88474ba826
Second fix for MIME64 inconsistency in serverKey.
...
The previous fix https://github.com/mastodon/mastodon-android/pull/486 would break any connections to any instances using WEB_SAFE MIME64 encoding on the serverKey, which actually appears to be the usual case.
This update reverts to the previous logic, but also converts standard MIME64 characters ('/' and '+') to their WEB_SAFE equivalents.
This ensures the standard case of WEB_SAFE BASE64 serverKeys and the anomolous case of DEFAULT BASE64 keys both work.
2023-01-18 13:23:17 -03:00
mishnz
dd92f1b66f
The Mastodon server does not currently use URL_SAFE encoding on its serverKey. Using URL_SAFE in this client means the client will crash for any server that uses a key that generates a Mime64 string containing a "+" or "/". This change removes the URL_SAFE logic. See: https://github.com/mastodon/mastodon-android/issues/483
2023-01-18 13:23:10 -03:00
Grishka
af1c7194e6
Workaround to fix #497
2023-01-18 18:41:48 +03:00
sk
b4fa74b78f
Merge remote-tracking branch 'upstream/master'
2023-01-16 09:39:29 +01:00
Grishka
1764e5f3d1
Paginate trending posts
2023-01-15 11:09:53 +03:00
FineFindus
71f6311598
merge: update to latest master
2023-01-14 12:51:29 +01:00
sk22
37278ff52b
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
2023-01-13 04:35:48 +01:00
sk
9b74373c22
improve domain check logic
2023-01-10 15:41:46 +01:00
sk
3cdcffe03d
implement announcements
...
closes #127
2023-01-10 11:16:14 -03:00
sk
b09aab4a1d
don't connect to fascists
2023-01-10 11:13:30 -03:00
mishnz
8dd22e1853
serverKey assignment was missing, corrected.
2023-01-10 11:08:33 -03:00
mishnz
34a4dd6d1f
Second fix for MIME64 inconsistency in serverKey.
...
The previous fix https://github.com/mastodon/mastodon-android/pull/486 would break any connections to any instances using WEB_SAFE MIME64 encoding on the serverKey, which actually appears to be the usual case.
This update reverts to the previous logic, but also converts standard MIME64 characters ('/' and '+') to their WEB_SAFE equivalents.
This ensures the standard case of WEB_SAFE BASE64 serverKeys and the anomolous case of DEFAULT BASE64 keys both work.
2023-01-10 11:08:27 -03:00
mishnz
6e13e592d0
The Mastodon server does not currently use URL_SAFE encoding on its serverKey. Using URL_SAFE in this client means the client will crash for any server that uses a key that generates a Mime64 string containing a "+" or "/". This change removes the URL_SAFE logic. See: https://github.com/mastodon/mastodon-android/issues/483
2023-01-10 11:08:20 -03:00
sk
54c29fd787
implement deleting lists
...
re: sk22#30
2023-01-10 13:27:28 +01:00
sk
294595513a
implement creating lists
...
re: sk22#30
2023-01-10 11:33:04 +01:00
sk
84179bc207
implement announcements
...
closes #127
2023-01-09 17:16:55 +01:00
