Avoid static/singleton references, and use a temporary Provider<> implementation that will eventually be replaced by Dagger. Change-Id: Id1bda9437f71cc9ddceb0a9ed1ba38d4787f2226 Reviewed-on: http://gerrit.dmdirc.com/2671 Reviewed-by: Greg Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Build Managertags/0.8rc1
|
|
||
57 |
|
57 |
|
58 |
|
58 |
|
59 |
|
59 |
|
|
60 |
|
|
|
61 |
|
|
60 |
|
62 |
|
61 |
|
63 |
|
62 |
|
64 |
|
|
|
||
66 |
|
68 |
|
67 |
|
69 |
|
68 |
|
70 |
|
69 |
|
|
|
|
71 |
|
|
70 |
|
72 |
|
71 |
|
73 |
|
72 |
|
74 |
|
|
|
||
106 |
|
108 |
|
107 |
|
109 |
|
108 |
|
110 |
|
109 |
|
|
|
|
111 |
|
|
|
112 |
|
|
|
113 |
|
|
110 |
|
114 |
|
111 |
|
115 |
|
112 |
|
116 |
|
|
|
||
506 |
|
510 |
|
507 |
|
511 |
|
508 |
|
512 |
|
|
513 |
|
|
|
514 |
|
|
|
515 |
|
|
|
516 |
|
|
|
517 |
|
|
|
518 |
|
|
|
519 |
|
|
|
520 |
|
|
|
521 |
|
|
|
522 |
|
|
|
523 |
|
|
|
524 |
|
|
509 |
|
525 |
|
|
|
||
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
|
30 |
|
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
|
|
||
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
43 |
|
|
44 |
|
|
|
45 |
|
|
44 |
|
46 |
|
45 |
|
47 |
|
46 |
|
48 |
|
|
|
||
48 |
|
50 |
|
49 |
|
51 |
|
50 |
|
52 |
|
51 |
|
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
|
56 |
|
|
|
57 |
|
|
|
58 |
|
|
|
59 |
|
|
52 |
|
60 |
|
53 |
|
61 |
|
54 |
|
62 |
|
|
63 |
|
|
|
64 |
|
|
|
65 |
|
|
55 |
|
66 |
|
56 |
|
|
|
|
67 |
|
|
|
68 |
|
|
|
69 |
|
|
|
70 |
|
|
|
71 |
|
|
57 |
|
72 |
|
58 |
|
73 |
|
59 |
|
74 |
|
|
|
||
65 |
|
80 |
|
66 |
|
81 |
|
67 |
|
82 |
|
68 |
|
|
|
|
83 |
|
|
69 |
|
84 |
|
70 |
|
85 |
|
71 |
|
86 |
|
|
|
||
98 |
|
113 |
|
99 |
|
114 |
|
100 |
|
115 |
|
101 |
|
|
|
|
116 |
|
|
102 |
|
117 |
|
103 |
|
118 |
|
104 |
|
119 |
|
|
|
||
150 |
|
165 |
|
151 |
|
166 |
|
152 |
|
167 |
|
153 |
|
|
|
|
168 |
|
|
154 |
|
169 |
|
155 |
|
170 |
|
156 |
|
171 |
|
|
|
||
168 |
|
183 |
|
169 |
|
184 |
|
170 |
|
185 |
|
171 |
|
|
|
|
186 |
|
|
172 |
|
187 |
|
173 |
|
188 |
|
174 |
|
189 |
|
|
|
||
188 |
|
203 |
|
189 |
|
204 |
|
190 |
|
205 |
|
191 |
|
|
|
192 |
|
|
|
|
206 |
|
|
|
207 |
|
|
193 |
|
208 |
|
194 |
|
209 |
|
195 |
|
210 |
|
|
|
||
249 |
|
264 |
|
250 |
|
265 |
|
251 |
|
266 |
|
252 |
|
|
|
253 |
|
|
|
|
267 |
|
|
254 |
|
268 |
|
255 |
|
269 |
|
256 |
|
270 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
|
25 |
|
|
25 |
|
26 |
|
26 |
|
27 |
|
|
28 |
|
|
|
29 |
|
|
27 |
|
30 |
|
28 |
|
31 |
|
29 |
|
32 |
|
30 |
|
33 |
|
|
34 |
|
|
|
35 |
|
|
|
36 |
|
|
31 |
|
37 |
|
32 |
|
38 |
|
33 |
|
39 |
|
34 |
|
40 |
|
|
41 |
|
|
35 |
|
42 |
|
36 |
|
43 |
|
|
44 |
|
|
|
45 |
|
|
37 |
|
46 |
|
38 |
|
47 |
|
39 |
|
48 |
|
40 |
|
49 |
|
41 |
|
|
|
|
50 |
|
|
42 |
|
51 |
|
43 |
|
52 |
|
44 |
|
53 |
|
|
|
||
6 |
|
6 |
|
7 |
|
7 |
|
8 |
|
8 |
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
9 |
|
13 |
|
10 |
|
14 |
|
11 |
|
15 |
|
12 |
|
16 |
|
13 |
|
17 |
|
14 |
|
18 |
|
|
19 |
|
|
|
20 |
|
|
15 |
|
21 |
|
16 |
|
22 |
|
17 |
|
23 |
|
18 |
|
24 |
|
19 |
|
25 |
|
|
26 |
|
|
|
27 |
|
|
20 |
|
28 |
|
21 |
|
29 |
|
22 |
|
30 |
|
|
|
||
28 |
|
36 |
|
29 |
|
37 |
|
30 |
|
38 |
|
31 |
|
|
|
|
39 |
|
|
|
40 |
|
|
|
41 |
|
|
32 |
|
42 |
|
33 |
|
43 |
|
34 |
|
44 |
|