Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8101ed4 authored by Sumit Pundir's avatar Sumit Pundir
Browse files

Fix Build Errors 

Fixes build errors occuring due to conflicts arising through patches
from /e/
parent ecf4129f

k9mail-library/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ dependencies { 


    testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}"

    testImplementation "org.robolectric:robolectric:${robolectricVersion}"

    testImplementation "junit:junit:${junitVersion}"

    compile "junit:junit:${junitVersion}"

    testImplementation "com.google.truth:truth:${truthVersion}"

    testImplementation "org.mockito:mockito-core:${mockitoVersion}"

k9mail-library/src/main/java/foundation/e/mail/mail/autoconfiguration/AutoConfigureAutoDiscover.java→k9mail-library/src/main/java/foundation/e/mail/mail/autoconfiguration/AutoConfigureAutodiscover.java

+0 −0

File moved.

View file

k9mail-library/src/main/java/foundation/e/mail/mail/oauth/OAuth2TokenProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package foundation.e.mail.mail.oauth; 




import foundation.e.mail.mail.AuthenticationFailedException;



import foundation.e.mail.mail.OAuth2NeedUserPromptException;



public abstract class OAuth2TokenProvider {

    /**

k9mail-library/src/main/java/foundation/e/mail/mail/oauth/SpecificOAuth2TokenProvider.java

+1 −1
Original line number Diff line number Diff line 
package foundation.e.mail.mail.mail.oauth;

package foundation.e.mail.mail.oauth;



import foundation.e.mail.mail.AuthenticationFailedException;

k9mail-library/src/main/java/foundation/e/mail/mail/store/RemoteStore.java

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ public abstract class RemoteStore extends Store { 
    /**

     * Get an instance of a remote mail store.

     */

    public static synchronized Store getInstance(Context context, StoreConfig storeConfig) throws MessagingException {

    public static synchronized Store getInstance(Context context, StoreConfig storeConfig, 

		    OAuth2TokenProvider oAuth2TokenProvider) 

		    throws MessagingException 

    {

        String uri = storeConfig.getStoreUri();



        if (uri.startsWith("local")) {