Instead, have Main provide the instance which becomes the singleton. This allows us to inject dependencies to it, and construct it using dagger later, while keeping all of the code that calls the static getIdentityManager() method working. Change-Id: I4ceaa062c84509bed66824f39cca8e76d25d131c Reviewed-on: http://gerrit.dmdirc.com/2677 Reviewed-by: Greg Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Build Managertags/0.8rc1
|
|
||
107 |
|
107 |
|
108 |
|
108 |
|
109 |
|
109 |
|
|
110 |
|
|
110 |
|
111 |
|
111 |
|
112 |
|
112 |
|
113 |
|
|
|
||
54 |
|
54 |
|
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
|
|
|
57 |
|
|
58 |
|
58 |
|
59 |
|
59 |
|
60 |
|
60 |
|
|
|
||
88 |
|
88 |
|
89 |
|
89 |
|
90 |
|
90 |
|
91 |
|
|
|
|
91 |
|
|
92 |
|
92 |
|
93 |
|
93 |
|
94 |
|
94 |
|
|
|
||
473 |
|
473 |
|
474 |
|
474 |
|
475 |
|
475 |
|
476 |
|
|
|
|
476 |
|
|
477 |
|
477 |
|
478 |
|
478 |
|
479 |
|
479 |
|
|
|
||
602 |
|
602 |
|
603 |
|
603 |
|
604 |
|
604 |
|
605 |
|
|
|
|
605 |
|
|
|
606 |
|
|
|
607 |
|
|
|
608 |
|
|
|
609 |
|
|
|
610 |
|
|
|
611 |
|
|
|
612 |
|
|
|
613 |
|
|
|
614 |
|
|
606 |
|
615 |
|
607 |
|
616 |
|
608 |
|
617 |
|
|
|
||
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
|
30 |
|
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
|
26 |
|
|
|
27 |
|
|
26 |
|
28 |
|
27 |
|
29 |
|
28 |
|
30 |
|
|
31 |
|
|
29 |
|
32 |
|
30 |
|
|
|
|
33 |
|
|
31 |
|
34 |
|
32 |
|
35 |
|
33 |
|
36 |
|
34 |
|
37 |
|
|
38 |
|
|
35 |
|
39 |
|
36 |
|
40 |
|
37 |
|
41 |
|
|
42 |
|
|
|
43 |
|
|
38 |
|
44 |
|
39 |
|
45 |
|
40 |
|
46 |
|
41 |
|
|
|
|
47 |
|
|
|
48 |
|
|
42 |
|
49 |
|
43 |
|
50 |
|
44 |
|
51 |
|
|
|
||
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
|
|
|
58 |
|
|
59 |
|
59 |
|
60 |
|
60 |
|
61 |
|
61 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
|
25 |
|
|
|
26 |
|
|
25 |
|
27 |
|
26 |
|
28 |
|
27 |
|
29 |
|
28 |
|
30 |
|
29 |
|
31 |
|
30 |
|
32 |
|
|
33 |
|
|
|
34 |
|
|
|
35 |
|
|
31 |
|
36 |
|
32 |
|
37 |
|
33 |
|
38 |
|
34 |
|
39 |
|
|
40 |
|
|
35 |
|
41 |
|
36 |
|
42 |
|
37 |
|
|
|
|
43 |
|
|
|
44 |
|
|
|
45 |
|
|
38 |
|
46 |
|
39 |
|
47 |
|
40 |
|
48 |
|
41 |
|
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
42 |
|
52 |
|
43 |
|
53 |
|
44 |
|
54 |
|
|
|
||
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
|
27 |
|
|
|
28 |
|
|
27 |
|
29 |
|
|
30 |
|
|
|
31 |
|
|
|
32 |
|
|
28 |
|
33 |
|
29 |
|
34 |
|
30 |
|
|
|
31 |
|
35 |
|
32 |
|
36 |
|
|
37 |
|
|
33 |
|
38 |
|
34 |
|
39 |
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
35 |
|
49 |
|
36 |
|
50 |
|
37 |
|
51 |
|
|
|
||
21 |
|
21 |
|
22 |
|
22 |
|
23 |
|
23 |
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
24 |
|
27 |
|
25 |
|
28 |
|
|
29 |
|
|
|
30 |
|
|
|
31 |
|
|
26 |
|
32 |
|
|
33 |
|
|
|
34 |
|
|
|
35 |
|
|
27 |
|
36 |
|
28 |
|
37 |
|
|
38 |
|
|
|
39 |
|
|
29 |
|
40 |
|
|
41 |
|
|
30 |
|
42 |
|
31 |
|
43 |
|
32 |
|
|
|
|
44 |
|
|
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
33 |
|
56 |
|
34 |
|
57 |
|
35 |
|
58 |
|