wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of Globals class

Browse source
This commit is contained in:
cketti 2018-06-22 14:24:19 +02:00
parent 8fb9dd5b49
commit d64e4b9a5c
17 changed files with 36 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/core/src/main/java/com/fsck/k9/DI.kt
View file

@ -11,6 +11,8 @@ import com.fsck.k9.mail.TransportProvider
import com.fsck.k9.mail.power.PowerManager
import com.fsck.k9.mailstore.StorageManager
import com.fsck.k9.mailstore.mailStoreModule
import com.fsck.k9.message.extractors.extractorModule
import com.fsck.k9.message.html.htmlModule
import com.fsck.k9.power.TracingPowerManager
import com.fsck.k9.ui.endtoend.endToEndUiModule
import com.fsck.k9.ui.folders.FolderNameFormatter
@ -44,7 +46,9 @@ object DI {
openPgpModule,
autocryptModule,
mailStoreModule,
backendModule
backendModule,
extractorModule,
htmlModule
)
@JvmStatic fun start(application: Application) {

21
app/core/src/main/java/com/fsck/k9/Globals.java
View file

@ -1,21 +0,0 @@
package com.fsck.k9;
import android.content.Context;
public class Globals {
private static Context context;
static void setContext(Context context) {
Globals.context = context;
}
public static Context getContext() {
if (context == null) {
throw new IllegalStateException("No context provided");
}
return context;
}
}

1
app/core/src/main/java/com/fsck/k9/K9.java
View file

@ -549,7 +549,6 @@ public class K9 extends Application {
super.onCreate();
app = this;
DI.start(this);
Globals.setContext(this);
K9MailLib.setDebugStatus(new K9MailLib.DebugStatus() {
@Override public boolean enabled() {

4
app/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java
View file

@ -10,6 +10,8 @@ import android.net.Uri;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.support.annotation.WorkerThread;
import com.fsck.k9.DI;
import timber.log.Timber;
import com.fsck.k9.mail.Body;
@ -41,7 +43,7 @@ public class AttachmentResolver {
@WorkerThread
public static AttachmentResolver createFromPart(Part part) {
AttachmentInfoExtractor attachmentInfoExtractor = AttachmentInfoExtractor.getInstance();
AttachmentInfoExtractor attachmentInfoExtractor = DI.get(AttachmentInfoExtractor.class);
Map<String, Uri> contentIdToAttachmentUriMap = buildCidToAttachmentUriMap(attachmentInfoExtractor, part);
return new AttachmentResolver(contentIdToAttachmentUriMap);
}

1
app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
View file

@ -4,4 +4,5 @@ import org.koin.dsl.module.applicationContext
val mailStoreModule = applicationContext {
bean { FolderRepositoryManager() }
bean { MessageViewInfoExtractor(get(), get(), get()) }
}

3
app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java
View file

@ -31,6 +31,7 @@ import android.text.TextUtils;
import com.fsck.k9.Account;
import com.fsck.k9.AccountStats;
import com.fsck.k9.DI;
import com.fsck.k9.K9;
import com.fsck.k9.Preferences;
import com.fsck.k9.controller.MessagingControllerCommands.PendingCommand;
@ -204,7 +205,7 @@ public class LocalStore {
messageFulltextCreator = MessageFulltextCreator.newInstance();
attachmentCounter = AttachmentCounter.newInstance();
pendingCommandSerializer = PendingCommandSerializer.getInstance();
attachmentInfoExtractor = AttachmentInfoExtractor.getInstance();
attachmentInfoExtractor = DI.get(AttachmentInfoExtractor.class);
this.account = account;

9
app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java
View file

@ -11,7 +11,6 @@ import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.support.annotation.WorkerThread;
import com.fsck.k9.Globals;
import com.fsck.k9.core.R;
import com.fsck.k9.crypto.MessageCryptoStructureDetector;
import com.fsck.k9.mail.Address;
@ -54,14 +53,6 @@ public class MessageViewInfoExtractor {
private final HtmlProcessor htmlProcessor;
public static MessageViewInfoExtractor getInstance() {
Context context = Globals.getContext();
AttachmentInfoExtractor attachmentInfoExtractor = AttachmentInfoExtractor.getInstance();
HtmlProcessor htmlProcessor = HtmlProcessor.newInstance();
return new MessageViewInfoExtractor(context, attachmentInfoExtractor, htmlProcessor);
}
@VisibleForTesting
MessageViewInfoExtractor(Context context, AttachmentInfoExtractor attachmentInfoExtractor,
HtmlProcessor htmlProcessor) {
this.context = context;

4
app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
View file

@ -14,7 +14,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import com.fsck.k9.Globals;
import com.fsck.k9.DI;
import com.fsck.k9.core.R;
import com.fsck.k9.activity.compose.ComposeCryptoStatus;
import com.fsck.k9.autocrypt.AutocryptOpenPgpApiInteractor;
@ -60,7 +60,7 @@ public class PgpMessageBuilder extends MessageBuilder {
public static PgpMessageBuilder newInstance() {
Context context = Globals.getContext();
Context context = DI.get(Context.class);
MessageIdGenerator messageIdGenerator = MessageIdGenerator.getInstance();
BoundaryGenerator boundaryGenerator = BoundaryGenerator.getInstance();
AutocryptOperations autocryptOperations = AutocryptOperations.getInstance();

4
app/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java
View file

@ -5,7 +5,7 @@ import android.content.Context;
import android.content.Intent;
import android.support.annotation.VisibleForTesting;
import com.fsck.k9.Globals;
import com.fsck.k9.DI;
import com.fsck.k9.mail.BoundaryGenerator;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.internet.MessageIdGenerator;
@ -15,7 +15,7 @@ import com.fsck.k9.mail.internet.MimeMessage;
public class SimpleMessageBuilder extends MessageBuilder {
public static SimpleMessageBuilder newInstance() {
Context context = Globals.getContext();
Context context = DI.get(Context.class);
MessageIdGenerator messageIdGenerator = MessageIdGenerator.getInstance();
BoundaryGenerator boundaryGenerator = BoundaryGenerator.getInstance();
return new SimpleMessageBuilder(context, messageIdGenerator, boundaryGenerator);

8
app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java
View file

@ -11,10 +11,10 @@ import android.content.Context;
import android.net.Uri;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import timber.log.Timber;
import android.support.annotation.WorkerThread;
import com.fsck.k9.Globals;
import com.fsck.k9.mail.Body;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.Part;
@ -32,12 +32,6 @@ public class AttachmentInfoExtractor {
private final Context context;
public static AttachmentInfoExtractor getInstance() {
Context context = Globals.getContext();
return new AttachmentInfoExtractor(context);
}
@VisibleForTesting
AttachmentInfoExtractor(Context context) {
this.context = context;
}

7
app/core/src/main/java/com/fsck/k9/message/extractors/KoinModule.kt Normal file
View file

@ -0,0 +1,7 @@
package com.fsck.k9.message.extractors
import org.koin.dsl.module.applicationContext
val extractorModule = applicationContext {
bean { AttachmentInfoExtractor(get()) }
}

7
app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessor.java
View file

@ -8,12 +8,7 @@ public class HtmlProcessor {
private final HtmlSanitizer htmlSanitizer;
public static HtmlProcessor newInstance() {
HtmlSanitizer htmlSanitizer = new HtmlSanitizer();
return new HtmlProcessor(htmlSanitizer);
}
private HtmlProcessor(HtmlSanitizer htmlSanitizer) {
HtmlProcessor(HtmlSanitizer htmlSanitizer) {
this.htmlSanitizer = htmlSanitizer;
}

8
app/core/src/main/java/com/fsck/k9/message/html/KoinModule.kt Normal file
View file

@ -0,0 +1,8 @@
package com.fsck.k9.message.html
import org.koin.dsl.module.applicationContext
val htmlModule = applicationContext {
bean { HtmlProcessor(get()) }
bean { HtmlSanitizer() }
}

3
app/core/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java
View file

@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
import android.support.v4.content.AsyncTaskLoader;
import com.fsck.k9.DI;
import timber.log.Timber;
import com.fsck.k9.mailstore.LocalMessage;
@ -15,7 +16,7 @@ import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
public class LocalMessageExtractorLoader extends AsyncTaskLoader<MessageViewInfo> {
private static final MessageViewInfoExtractor messageViewInfoExtractor = MessageViewInfoExtractor.getInstance();
private static final MessageViewInfoExtractor messageViewInfoExtractor = DI.get(MessageViewInfoExtractor.class);
private final LocalMessage message;

11
app/core/src/test/java/com/fsck/k9/GlobalsHelper.java
View file

@ -1,11 +0,0 @@
package com.fsck.k9;
import android.content.Context;
public class GlobalsHelper {
public static void setContext(Context context) {
Globals.setContext(context);
}
}

3
app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
View file

@ -11,6 +11,7 @@ import java.util.TimeZone;
import android.app.Application;
import android.support.annotation.NonNull;
import com.fsck.k9.DI;
import com.fsck.k9.K9RobolectricTest;
import com.fsck.k9.activity.K9ActivityCommon;
import com.fsck.k9.mail.Address;
@ -73,7 +74,7 @@ public class MessageViewInfoExtractorTest extends K9RobolectricTest {
context = RuntimeEnvironment.application;
HtmlProcessor htmlProcessor = createFakeHtmlProcessor();
attachmentInfoExtractor = spy(AttachmentInfoExtractor.getInstance());
attachmentInfoExtractor = spy(DI.get(AttachmentInfoExtractor.class));
messageViewInfoExtractor = new MessageViewInfoExtractor(context, attachmentInfoExtractor, htmlProcessor);
}

2
app/core/src/test/java/com/fsck/k9/mailstore/StoreSchemaDefinitionTest.java
View file

@ -15,7 +15,6 @@ import android.text.TextUtils;
import com.fsck.k9.Account;
import com.fsck.k9.core.BuildConfig;
import com.fsck.k9.GlobalsHelper;
import com.fsck.k9.K9;
import com.fsck.k9.core.R;
import com.fsck.k9.RobolectricTest;
@ -45,7 +44,6 @@ public class StoreSchemaDefinitionTest extends RobolectricTest {
Application application = RuntimeEnvironment.application;
K9.app = application;
GlobalsHelper.setContext(application);
StorageManager.getInstance(application);
storeSchemaDefinition = createStoreSchemaDefinition();