From a979427b725325fa0f14ac88550638e20eb8315b Mon Sep 17 00:00:00 2001 From: WipedLifePotato Date: Mon, 18 Mar 2024 10:50:15 +0700 Subject: [PATCH] fix compilation of releases apks --- app/build.gradle | 14 ++++++++++---- .../purplei2p/i2pd/I2PDPermsAskerActivity.java | 2 ++ .../org/purplei2p/i2pd/I2PdQSTileService.java | 5 ++++- .../purplei2p/i2pd/MainPreferenceActivity.java | 4 ++++ app/src/main/res/layout/activity_main.xml | 16 ++++++++-------- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0906464..f9b9b99 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,20 +8,26 @@ dependencies { // implementation 'org.ini4j:ini4j:0.5.4' implementation 'org.apache.commons:commons-configuration2:2.9.0' } - -configurations { - all { + configurations { + all{ + //exclude group: 'commons-logging', module: 'commons-logging' + //exclude group: 'org.apache.httpcomponents' exclude module: 'httpclient' - exclude module: 'commons-logging' } } android { + lintOptions { + // Not so a good way + disable 'DuplicatePlatformClasses' + } + compileSdkVersion 33 defaultConfig { applicationId "org.purplei2p.i2pd" targetSdkVersion 33 + // TODO: 24? minSdkVersion 16 versionCode 2500200 versionName "2.50.2" diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java b/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java index 318ab85..2df2780 100644 --- a/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java +++ b/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java @@ -183,6 +183,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } } } else if (requestCode == APP_STORAGE_ACCESS_REQUEST_CODE && resultCode == RESULT_OK) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { if (Environment.isExternalStorageManager()) { startMainActivity(); } else { @@ -195,5 +196,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } else { finish(); // close the app } + } } } diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PdQSTileService.java b/app/src/main/java/org/purplei2p/i2pd/I2PdQSTileService.java index f5b5527..3a06165 100644 --- a/app/src/main/java/org/purplei2p/i2pd/I2PdQSTileService.java +++ b/app/src/main/java/org/purplei2p/i2pd/I2PdQSTileService.java @@ -5,10 +5,13 @@ import android.service.quicksettings.TileService; import android.util.Log; +import android.annotation.TargetApi; +import android.os.Build; + +@TargetApi(Build.VERSION_CODES.N) public class I2PdQSTileService extends TileService { private static final String TAG = "MyQSTileService"; - @Override public void onClick() { super.onClick(); diff --git a/app/src/main/java/org/purplei2p/i2pd/MainPreferenceActivity.java b/app/src/main/java/org/purplei2p/i2pd/MainPreferenceActivity.java index 192a8fd..3d2ecec 100644 --- a/app/src/main/java/org/purplei2p/i2pd/MainPreferenceActivity.java +++ b/app/src/main/java/org/purplei2p/i2pd/MainPreferenceActivity.java @@ -1,4 +1,5 @@ package org.purplei2p.i2pd; +import android.os.Build; import android.os.Bundle; import android.preference.CheckBoxPreference; @@ -39,12 +40,15 @@ protected void onCreate(Bundle savedInstanceState) { if (!isOldConfigExists) { try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Files.exists(Paths.get(CONFIG_FILE_PATH))) { Files.copy(Paths.get(CONFIG_FILE_PATH), Paths.get(CONFIG_FILE_PATH + OLD_FILE_PREFIX)); } + } // if build ... } catch (IOException e) { e.printStackTrace(); } + } // delete empty sections { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 64b44b1..793a9ae 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -52,7 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textAppearance="@android:style/TextAppearance.Material.Large" + android:textAppearance="@android:style/TextAppearance.Large" android:textColor="#DFDFDF" /> @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:clickable="false" android:text="@string/services_socks_proxy" - android:textAppearance="@android:style/TextAppearance.Material.Small" + android:textAppearance="@android:style/TextAppearance.Small" android:textColor="#DFDFDF" /> @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:clickable="false" android:text="@string/services_bob" - android:textAppearance="@android:style/TextAppearance.Material.Small" + android:textAppearance="@android:style/TextAppearance.Small" android:textColor="#DFDFDF" /> @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:clickable="false" android:text="@string/services_sam" - android:textAppearance="@android:style/TextAppearance.Material.Small" + android:textAppearance="@android:style/TextAppearance.Small" android:textColor="#DFDFDF" /> @@ -145,11 +145,11 @@ android:layout_height="wrap_content" android:clickable="false" android:text="@string/services_i2cp" - android:textAppearance="@android:style/TextAppearance.Material.Small" + android:textAppearance="@android:style/TextAppearance.Small" android:textColor="#DFDFDF" /> - \ No newline at end of file +