Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-08-10 11:40:18 +02:00
Code Issues Projects Releases Wiki Activity
7,609 Commits 133 Branches 207 Tags
master
Commit Graph
88 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ernir Erlingsson 8455569e88 moved window requests above onCreate 2017-07-30 22:42:03 +02:00
Ernir Erlingsson f6cdbda5bb Merge branch 'master' of https://code.briarproject.org/akwizgran/briar 2017-05-29 11:06:16 +02:00
Ernir Erlingsson 855c600a3e hotfix list restore NPE for user testing 2017-05-29 11:05:46 +02:00
Ernir Erlingsson c9dcd906c9 final pre-merge fixes 2017-05-06 21:36:25 +02:00
Ernir Erlingsson 7024e04d15 fixed final akwizgran comments 2017-05-06 21:31:53 +02:00
Ernir Erlingsson 948410a064 fixed unread buttons for threaded lists and akwizgran's comments 2017-05-05 14:49:53 +02:00
Ernir Erlingsson 5f4e1ecdfd improvements after code review #1 
fix
 2017-05-02 11:42:55 +02:00
Ernir Erlingsson 044719432a list position save and restore now implemented for threaded lists 2017-05-02 11:42:55 +02:00
Ernir Erlingsson d1a929da85 bumped expire date 2017-05-02 11:42:15 +02:00
Ernir Erlingsson ab91520813 refactored the activity module 2016-11-17 13:57:02 +01:00
Ernir Erlingsson c36bb3e60e created runOnUiThreadUnlessDestroyed fragment wrapper 2016-11-07 17:11:57 +01:00
Ernir Erlingsson 88272c5d61 improvements after dev comments 2016-11-01 13:33:12 +01:00
Ernir Erlingsson eaa393a7ed added a cache to the IdentityManager, changed its signature, modified when and where the author is stored 
made the author creation single-threaded again in the LifecycleManager, removed redundant code
 2016-11-01 12:51:49 +01:00
Ernir Erlingsson 6b3db67ef5 removed fragment progress callback and fixed missing header 2016-10-05 14:21:14 +02:00
Ernir Erlingsson 92f2e7b0fc merge with master and fixes after comments 2016-09-29 01:30:13 +02:00
Ernir Erlingsson 2d59b9095c Fixing concurrency issues and refactoring code 2016-09-27 23:02:44 +02:00
Ernir Erlingsson 48e1a65a24 raised api level and made necessary code changes 2016-08-22 00:08:47 +02:00
Ernir Erlingsson 55601bc2c3 removed step string 2016-07-12 12:21:50 +02:00
Ernir Erlingsson b2b97f31f3 Removed the Fab and moved the icon into the toolbar 2016-07-07 15:40:44 +02:00
Ernir Erlingsson a2a5b746c5 Forum improvements 2016-06-22 13:50:12 +02:00
Ernir Erlingsson ac8c1c0eee synched conversation and forum input 2016-06-21 13:47:33 +02:00
Ernir Erlingsson 8a29207bd0 Fixing fragment instance restore 2016-06-20 21:56:50 +02:00
Ernir Erlingsson 69b0bec033 fix persistance 2016-06-14 23:53:05 +02:00
Ernir Erlingsson e3fc015ec3 fixed sub-tree duplicate bug and also wrong reply count 2016-06-01 23:32:19 +02:00
Ernir Erlingsson 441fce8500 fixed forum crash bug 2016-05-31 23:12:33 +02:00
Ernir Erlingsson 86039b81c0 Forum, nested discussions front end UI/UX, rev 2 2016-05-30 23:57:01 +02:00
Ernir Erlingsson d2ba7c9b7f generic sorted message tree 2016-05-25 22:12:20 +02:00
Ernir ErlingssonandTorsten Grote 21b237a629 ForumManager: Added parent id to metadata and a unit test 2016-05-24 15:12:37 -03:00
Ernir Erlingsson eac17e74a1 cleanup 2016-05-11 23:55:45 +02:00
Ernir Erlingsson 698ca41720 Fixed the controllers and am now saving the current fragment 2016-05-11 23:50:11 +02:00
Ernir Erlingsson f81c8fcbd0 rebased with master 2016-05-11 12:22:53 +02:00
Ernir Erlingsson c93e78f178 modifications based on Akwizgran's comments 2016-05-11 11:55:17 +02:00
Ernir Erlingsson d4232b6a01 cleanup 2016-05-11 11:55:17 +02:00
Ernir Erlingsson 64d1e25ad7 cleanup 2016-05-11 11:55:16 +02:00
Ernir Erlingsson f855c9ea28 Finished unit tests for SetupActivity and its Controller 2016-05-11 11:52:57 +02:00
Ernir Erlingsson 80f79d9ee0 finished Activity mock 2016-05-11 11:52:57 +02:00
Ernir Erlingsson 8bb1d444c6 interlude 2016-05-11 11:52:56 +02:00
Ernir Erlingsson adb7d37f86 implementing robolectric and mockito 2016-05-11 11:52:56 +02:00
Ernir Erlingsson aa3ef896f5 further polish 2016-05-11 11:52:56 +02:00
Ernir Erlingsson da50c5dcc3 cleanup and minor refactoring 2016-05-11 11:52:56 +02:00
Ernir Erlingsson e809aaa932 merge and update 2016-05-11 11:50:34 +02:00
Ernir Erlingsson ef3b41dc1d comment & log cleanup 2016-05-11 11:50:34 +02:00
Ernir Erlingsson 604cfd5202 Fix transport update 2016-05-11 11:50:34 +02:00
Ernir Erlingsson a14e981236 Switched AppBus for ResultHandler, Controller for Helper. Added the basics for LifecycleControllers and implemented it for BriarActivity and NavDrawerActivity 2016-05-11 11:50:34 +02:00
Ernir Erlingsson 27098db18f fix compile error 2016-05-11 11:50:34 +02:00
Ernir Erlingsson 8d021aab50 cleaning up 2016-05-11 11:50:34 +02:00
Ernir Erlingsson 5d8ba660c2 merge 2016-05-11 11:50:33 +02:00
Ernir Erlingsson a9de12520d phase 2: helpers and app bus 2016-05-11 11:42:38 +02:00
Ernir Erlingsson 7b552bde1e phase 1: Activities and Fragments 2016-05-11 11:42:38 +02:00
Ernir Erlingsson 11bfa212cc minor tweaks 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 85c66417b5 branch cleanup 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 686729b045 refactor with master and fixed files that were accidentally clobbered 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 4da63b3800 Modified the project structure, removed module extension and went instead for a non-complete core dependency graph 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 7670bc48ea Removed unecessary module 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 6f233070fe Semi-encapsulated the core/api dependency graphs and created a proper structure to load eager singletons 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 10764d727b rebased with master 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 9af3ce123a Added eager singletons and made some fixes 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 5aba1d79f1 Fixes after comments, also removed the CryptoComoponent from the IdentIcons 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 95d89553d5 merged with master 2016-03-14 21:02:51 +01:00
Ernir Erlingsson ac5d68df81 Added dependency verifications and removed Splash header 2016-03-14 21:01:21 +01:00
Ernir Erlingsson 25324697ac cleanup and added missing desktop modules 2016-03-14 21:01:21 +01:00
Ernir Erlingsson 1be400eb84 Switched Roboguice/Guice out for Dagger 2 2016-03-14 21:01:21 +01:00
Ernir Erlingsson 73c67e2e82 tweaked proguard 2016-02-02 12:21:08 +01:00
Ernir Erlingsson d340d69742 added proguard and cleaned dependencies 2016-02-02 12:20:26 +01:00
Ernir Erlingssonandakwizgran dae29eecce Navigation drawer (squashed and rebased). 2016-01-21 16:49:21 +00:00
Ernir Erlingsson 13de33c329 fixed target 2015-12-15 13:57:08 +01:00
Ernir Erlingsson bd42661422 improved the crash handler and refactored the manifest 2015-12-15 11:53:03 +01:00
Ernir Erlingsson cdf8392725 code nitpicks and color fix 2015-12-14 22:22:49 +01:00
Ernir Erlingsson 6ac999c113 Added AppCompatBar and fixed dependencies 2015-12-14 14:03:55 +01:00
Ernir Erlingsson f033f4fae0 Merge branch '40-forgotten-password' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password 
Conflicts:
	briar-android/res/values/strings.xml
	briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
 2015-12-10 11:12:10 +01:00
Ernir Erlingsson b33d8d1ee5 fixed missing string 2015-12-10 11:07:10 +01:00
Ernir Erlingsson a5fd7ff9dc Added dependency injections for FileUtils and removed redundant code 2015-12-10 11:07:10 +01:00
Ernir Erlingsson fb2a44c478 code re-structure, mostly nitpicks :) 2015-12-10 11:02:15 +01:00
Ernir Erlingsson 886cad91f0 Added a dialog and refactored code 2015-12-10 11:02:15 +01:00
Ernir Erlingsson ca00b414e7 Fixed lost code from merge 2015-12-10 11:01:00 +01:00
Ernir Erlingsson 27edc2e3e8 code and ui refactoring in the Password activity, encapsulation and wrappers. 2015-12-10 11:01:00 +01:00
Ernir Erlingsson 0fe514606f removed sneaky iml file 2015-12-10 10:51:09 +01:00
Ernir Erlingsson 8c0f295879 Added dependency injections for FileUtils and removed redundant code 2015-12-10 10:49:28 +01:00
Ernir Erlingsson b83fe85910 code re-structure, mostly nitpicks :) 2015-12-09 11:50:26 +01:00
Ernir Erlingsson 7e9cff3118 Merge branch 'master' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password 
Conflicts:
	.gitignore
	briar-android/briar-android.iml
 2015-12-09 11:47:53 +01:00
Ernir Erlingsson 2052c8456f Added a dialog and refactored code 2015-12-09 10:29:34 +01:00
Ernir Erlingsson 105b627152 Merge branch '160-improve-gitignore' of https://code.briarproject.org/akwizgran/briar into 160-improve-gitignore 
Conflicts:
	.gitignore
 2015-12-09 00:35:50 +01:00
Ernir Erlingsson 2a61fa94d1 modified .gitignore and removed *.iml from git 2015-12-09 00:33:22 +01:00
Ernir Erlingsson 74298de1ac improved git ignore 2015-12-09 00:14:13 +01:00
Ernir Erlingsson 428c3dd1b2 Fixed lost code from merge 2015-12-09 00:08:08 +01:00
Ernir Erlingsson 43f562a7bc code and ui refactoring in the Password activity, encapsulation and wrappers. 2015-12-09 00:05:48 +01:00
Ernir Erlingsson 6d13c4e095 improved git ignore 2015-12-08 23:58:59 +01:00
Ernir Erlingsson 6d07a66063 improved git ignore 2015-12-08 11:05:03 +01:00