Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit 3e4da0b

Browse files
committed
Release 0.2.1
1 parent 4fa17e2 commit 3e4da0b

File tree

5 files changed

+38
-9
lines changed

5 files changed

+38
-9
lines changed

app/build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ plugins {
44
}
55

66
android {
7-
compileSdk 30
7+
compileSdk 31
88

99
defaultConfig {
1010
applicationId "com.fox2code.mmm"
1111
minSdk 21
12-
targetSdk 30
13-
versionCode 9
14-
versionName "0.2.0"
12+
targetSdk 31
13+
versionCode 10
14+
versionName "0.2.1"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
@@ -49,7 +49,9 @@ configurations {
4949

5050
dependencies {
5151
// UI
52-
implementation 'androidx.appcompat:appcompat:1.3.1'
52+
implementation 'androidx.appcompat:appcompat:1.4.0'
53+
implementation 'androidx.emoji2:emoji2:1.0.0'
54+
implementation 'androidx.emoji2:emoji2-views-helper:1.0.0'
5355
implementation 'androidx.preference:preference:1.1.1'
5456
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
5557
implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -58,7 +60,8 @@ dependencies {
5860
implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
5961

6062
// Utils
61-
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1'
63+
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
64+
implementation 'com.squareup.okhttp3:okhttp-brotli:4.9.3'
6265
implementation 'com.github.topjohnwu.libsu:io:3.1.2'
6366

6467
// Markdown

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,13 @@
6565
</activity>
6666
<activity android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
6767
tools:node="remove"/>
68+
<provider
69+
android:name="androidx.startup.InitializationProvider"
70+
android:authorities="${applicationId}.androidx-startup"
71+
android:exported="false"
72+
tools:node="merge">
73+
<meta-data android:name="androidx.emoji2.text.EmojiCompatInitializer"
74+
tools:node="remove" />
75+
</provider>
6876
</application>
6977
</manifest>

app/src/main/java/com/fox2code/mmm/MainApplication.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
import android.graphics.Color;
1010
import android.os.SystemClock;
1111
import android.text.SpannableStringBuilder;
12+
import android.util.Log;
1213

1314
import androidx.annotation.NonNull;
1415
import androidx.annotation.StyleRes;
15-
import androidx.appcompat.view.ContextThemeWrapper;
16+
import androidx.emoji2.text.DefaultEmojiCompatConfig;
17+
import androidx.emoji2.text.EmojiCompat;
18+
import androidx.emoji2.text.FontRequestEmojiCompatConfig;
1619

1720
import com.fox2code.mmm.compat.CompatActivity;
1821
import com.fox2code.mmm.compat.CompatThemeWrapper;
@@ -270,6 +273,20 @@ public void onCreate() {
270273
this.setManagerThemeResId(themeResId);
271274
// Update SSL Ciphers if update is possible
272275
GMSProviderInstaller.installIfNeeded(this);
276+
// Update emoji config
277+
FontRequestEmojiCompatConfig fontRequestEmojiCompatConfig =
278+
DefaultEmojiCompatConfig.create(this);
279+
if (fontRequestEmojiCompatConfig != null) {
280+
fontRequestEmojiCompatConfig.setReplaceAll(true);
281+
fontRequestEmojiCompatConfig
282+
.setMetadataLoadStrategy(EmojiCompat.LOAD_STRATEGY_MANUAL);
283+
EmojiCompat emojiCompat = EmojiCompat.init(fontRequestEmojiCompatConfig);
284+
new Thread(() -> {
285+
Log.d("MainApplication", "Loading emoji compat...");
286+
emojiCompat.load();
287+
Log.d("MainApplication", "Emoji compat loaded!");
288+
}, "Emoji compat init.").start();
289+
}
273290
}
274291

275292
@Override

app/src/main/java/com/fox2code/mmm/utils/Http.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import okhttp3.Request;
3131
import okhttp3.Response;
3232
import okhttp3.ResponseBody;
33+
import okhttp3.brotli.BrotliInterceptor;
3334
import okhttp3.dnsoverhttps.DnsOverHttps;
3435

3536
public class Http {
@@ -42,6 +43,7 @@ public class Http {
4243
httpclientBuilder.connectTimeout(15, TimeUnit.SECONDS);
4344
httpclientBuilder.writeTimeout(15, TimeUnit.SECONDS);
4445
httpclientBuilder.readTimeout(15, TimeUnit.SECONDS);
46+
httpclientBuilder.addInterceptor(BrotliInterceptor.INSTANCE);
4547
httpclientBuilder.proxy(Proxy.NO_PROXY); // Do not use system proxy
4648
Dns dns = Dns.SYSTEM;
4749
try {
@@ -94,8 +96,7 @@ public static OkHttpClient getHttpclientWithCache() {
9496
}
9597

9698
private static Request.Builder makeRequestBuilder() {
97-
return new Request.Builder().header("Connection", "keep-alive")
98-
.header("Upgrade-Insecure-Requests", "1");
99+
return new Request.Builder().header("Upgrade-Insecure-Requests", "1");
99100
}
100101

101102
public static byte[] doHttpGet(String url,boolean allowCache) throws IOException {

screenshot.jpg

-3.56 KB
Loading

0 commit comments

Comments
 (0)