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

Commit 6c48e64d authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Fixed release build issues and Gmail OAuth2.0 client Id.

parent cb4cd183
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,22 @@
-dontwarn okio.**
-dontwarn com.squareup.moshi.**

# This dnsjava class uses old Sun API
-dontnote org.xbill.DNS.spi.DNSJavaNameServiceDescriptor
-dontwarn org.xbill.DNS.spi.DNSJavaNameServiceDescriptor

# See http://stackoverflow.com/questions/5701126, happens in dnsjava
-optimizations !code/allocation/variable

-dontwarn javax.annotation.**
-dontwarn retrofit2.Platform$Java8

# OkHttp
-dontwarn okio.**
-dontwarn com.squareup.okhttp3.**
-dontwarn javax.annotation.Nullable
-dontwarn javax.annotation.ParametersAreNonnullByDefault

# Project specific rules
-dontnote com.fsck.k9.PRNGFixes
-dontnote com.fsck.k9.ui.messageview.**
+5.58 MiB

File added.

No diff preview for this file type.

+1 −0
Original line number Diff line number Diff line
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":25000,"versionName":"5.500-SNAPSHOT","enabled":true,"outputFile":"k9mail-release.apk","fullName":"release","baseName":"release"},"path":"k9mail-release.apk","properties":{}}]
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ import retrofit2.http.POST;

public class GmailOAuth2TokenStore extends AndroidSpecificOAuth2TokenProvider {
    private static final String GOOGLE_API_BASE_URL = "https://www.googleapis.com/";
    private static final String CLIENT_ID = "486728022013-39d7vq9t06r004r7ec9m2eti0p1ihs12.apps.googleusercontent.com";
    private static final String REDIRECT_URI = "com.fsck.k9.debug:/oauth2redirect";
    private static final String CLIENT_ID = "739646490039-9pnem0cf4pmqair96j9dj0e9t0locc5l.apps.googleusercontent.com";
    private static final String REDIRECT_URI = "com.fsck.k9:/oauth2redirect";
    private static final String AUTHORIZATION_URL = "https://accounts.google.com/o/oauth2/v2/auth?" +
            "scope=https://mail.google.com/&" +
            "response_type=code&" +
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ public class GmailWebViewClient extends OAuth2WebViewClient {

    @Override
    protected boolean arrivedAtRedirectUri(Uri uri) {
        return "com.fsck.k9.debug".equals(uri.getScheme());
        return "com.fsck.k9".equals(uri.getScheme());
    }

    @Override
Loading