nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
809 Commits 2 Branches 1 Tag
38df1ba6f75ea93faead32c991cb1359514ad7db
Commit Graph

809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vitor Pamplona 38df1ba6f7 Merge commit '40a6feab8a4a36813644c19ca034333b73e98132' into less_memory_test_branch 2023-03-08 17:35:30 -05:00
Vitor Pamplona 6c9aa9b6ff Merge commit '9c7a5b73b3a75a465f78c1d97726e66f0e3032a3' into less_memory_test_branch 2023-03-08 17:35:21 -05:00
Vitor Pamplona 26b581b13c Merge commit 'a41f2c38ec9683f0e9aaca3e4cffb2cd45f21145' into less_memory_test_branch 2023-03-08 17:34:40 -05:00
Vitor Pamplona 6a3cae1c8d Merge commit 'c7ba0bce5bbc3edd8ece9669751b110d59c40052' into less_memory_test_branch 2023-03-08 17:34:29 -05:00
Vitor Pamplona 40ac31983c Merge commit 'c9b859610e660f7e2d906594410bc7fbf2b1914a' into less_memory_test_branch 
# Conflicts:
#	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
 2023-03-08 17:34:22 -05:00
Vitor Pamplona 8c25667d0f Organize imports to simplify merge 2023-03-08 17:29:36 -05:00
Vitor Pamplona 6acc842d4f Readding LocalCacheImport 2023-03-08 17:18:25 -05:00
Vitor Pamplona fc4b68b264 Merge commit 'f1b6927bb37d1c9887fb48aa5655a6d2df558e81' into less_memory_test_branch 
# Conflicts:
#	app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
#	app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
#	app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelCreateEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/TextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt
 2023-03-08 17:17:03 -05:00
Vitor Pamplona 9470560002 Testing Lint Commit 2023-03-08 17:07:56 -05:00
Vitor Pamplona cd950ee946 Merge commit '2d92e1d44491d62005e45adcf3dc1c5a403c386f' into less_memory_test_branch 2023-03-08 17:04:24 -05:00
Vitor Pamplona f9f68e2a4f Merge commit '691b8225035d8fe59539a971a85b1df2f2f84ebe' into less_memory_test_branch 2023-03-08 17:03:42 -05:00
detherminal 9c7a5b73b3 Added Turkish Translation 2023-03-08 18:45:07 +03:00
Vitor Pamplona 40a6feab8a Fixes Clickable tag for addresses (naddr) 2023-03-08 09:59:19 -05:00
Vitor Pamplona a41f2c38ec Merge pull request #225 from Chemaclass/refactor-nip19-into-module 
Refactor Nip19 into module
 2023-03-08 09:49:37 -05:00
Chemaclass 26b5061042 Rename Utils to Tlv 2023-03-08 14:21:52 +00:00
Chemaclass 49199fe892 Change Nip19 from class to object 2023-03-08 14:21:52 +00:00
Chemaclass 30fe861853 Extract from Nip19 global funcs into another script 2023-03-08 14:21:52 +00:00
Chemaclass 1998711e60 Extract TlvTypes to nip19 module 2023-03-08 14:21:52 +00:00
Vitor Pamplona 9ab1828634 Merge pull request #224 from Chemaclass/fix-hu-translations 
Fix HU translations
 2023-03-08 09:18:16 -05:00
Chemaclass c7ba0bce5b Fix HU translations 2023-03-08 14:14:58 +00:00
Vitor Pamplona dffce92aa7 Merge pull request #220 from Chemaclass/add-ktlint 
Add ktlint
 2023-03-08 09:08:53 -05:00
Vitor Pamplona 6f71685f08 Merge branch 'main' into add-ktlint 2023-03-08 09:08:46 -05:00
Vitor Pamplona b763d3c140 Merge pull request #222 from ZsZolee/main 
Hungarian Translation
 2023-03-08 09:04:21 -05:00
Vitor Pamplona 12b2957648 Merge pull request #219 from alltheseas/patch-1 
Added Privacy on Relays to Readme.MD
 2023-03-08 09:03:37 -05:00
Vitor Pamplona 3fd656da9f Removes several Indexes from User and Notes to see if we can reduce App's memory usage. 2023-03-08 08:47:33 -05:00
Vitor Pamplona 6543df5d28 Adds a Log to Failures in Parsing contained Zap events 2023-03-08 08:45:03 -05:00
Vitor Pamplona 67d6b24993 Removing unnecessary coroutine 2023-03-08 08:44:05 -05:00
Vitor Pamplona 9f5b3d82c5 Making LnInvoice amount a Lazy property. 2023-03-08 08:43:38 -05:00
Vitor Pamplona 7275799f9d Solves crashing when events have null tags. 2023-03-08 08:31:56 -05:00
Vitor Pamplona 77a70c3202 Duplicated Stop 2023-03-08 08:28:09 -05:00
Zoltan 00f38670a5 Hungarian Translation 
This time I made the proper structure for the file. (Thanks Jose Maria Valera Reales for the help!)
 2023-03-08 09:58:24 +01:00
alltheseas 4a8ec97f2f Update README.md 
Added section on information visibility, information permanence, and DM privacy.
 2023-03-07 13:59:23 -06:00
Chemaclass c9b859610e Format last files with conflicts 2023-03-07 20:43:34 +01:00
Chemaclass f1b6927bb3 Merge branch 'main' into add-ktlint 
Conflicts:
	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
	app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
	app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/ReactionEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/RepostEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
	app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
	app/src/test/java/com/vitorpamplona/amethyst/NIP19ParserTest.kt
 2023-03-07 20:42:38 +01:00
Vitor Pamplona 9720fdfce9 Moving aTag check to the ATag class 2023-03-07 13:53:03 -05:00
Vitor Pamplona 1919dc5c81 1. Moves AddressableNote index from NAddr to aTag format due to the presence of a preferred relay inside NAddr, which is an optional field and should not be part of the idex. 
2. Parses relay information for Addressable Notes
 2023-03-07 13:48:05 -05:00
Chemaclass eff8dbbafa Run linter 2023-03-07 19:47:38 +01:00
Chemaclass 2d92e1d444 Add Linder to build CI 2023-03-07 19:45:50 +01:00
Chemaclass c4c8c0fbf7 Adding pre-commit git hook 2023-03-07 19:08:11 +01:00
alltheseas f39c84d6a4 Update README.md 
added additional information on relays & privacy
 2023-03-07 12:06:52 -06:00
Chemaclass f8d6cf8dba Add Linting section to README 2023-03-07 18:59:52 +01:00
Chemaclass 691b822503 Install ktlint plugin 2023-03-07 18:58:13 +01:00
alltheseas d9d05bf6ba Added Privacy on Relays to Readme.MD 
Added a small section on user privacy implications on Amethyst & relays use.
 2023-03-07 10:35:54 -06:00
Vitor Pamplona 5add9669f2 Merge pull request #208 from maxmoney21m/bugfix/204-fingerprint-crash-android9 
Biometric support down to app's minimum SDK level 26, fixes #204
 2023-03-06 13:10:31 -05:00
Vitor Pamplona a1751cc831 Merge pull request #213 from Chemaclass/fix-local-cache 
Fix failing building due to an error on LocalCache
 2023-03-06 13:10:11 -05:00
Chemaclass f22a1ddf47 Use event.id() 2023-03-06 18:43:23 +01:00
Vitor Pamplona 9fb8bae349 Merge pull request #205 from Chemaclass/refactor-UserProfileZapsFeedFilter 
Refactor UserProfileZapsFeedFilter
 2023-03-06 12:33:48 -05:00
Vitor Pamplona 17b9280660 Merge pull request #210 from bkBrunobk/patch-2 
Update strings.xml
 2023-03-06 12:27:49 -05:00
BackTo2009 95905e6c95 Update strings.xml 2023-03-06 13:19:21 +01:00
BackTo2009 d0bcb4f4c2 <string name="about_us">"à propos"</string>Update app/src/main/res/values-fr/strings.xml 
Co-authored-by: Jose Maria Valera Reales <chemaclass@outlook.es>
 2023-03-06 12:42:05 +01:00