Browse Source

fix compilation of releases apks

pull/66/head
WipedLifePotato 2 months ago
parent
commit
a979427b72
  1. 14
      app/build.gradle
  2. 2
      app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java
  3. 5
      app/src/main/java/org/purplei2p/i2pd/I2PdQSTileService.java
  4. 4
      app/src/main/java/org/purplei2p/i2pd/MainPreferenceActivity.java
  5. 16
      app/src/main/res/layout/activity_main.xml

14
app/build.gradle

@ -8,20 +8,26 @@ dependencies { @@ -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"

2
app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java

@ -183,6 +183,7 @@ public class I2PDPermsAskerActivity extends Activity { @@ -183,6 +183,7 @@ public class I2PDPermsAskerActivity extends Activity {
}
}
} 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 @@ public class I2PDPermsAskerActivity extends Activity { @@ -195,5 +196,6 @@ public class I2PDPermsAskerActivity extends Activity {
} else {
finish(); // close the app
}
}
}
}

5
app/src/main/java/org/purplei2p/i2pd/I2PdQSTileService.java

@ -5,10 +5,13 @@ import android.service.quicksettings.Tile; @@ -5,10 +5,13 @@ import android.service.quicksettings.Tile;
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();

4
app/src/main/java/org/purplei2p/i2pd/MainPreferenceActivity.java

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
package org.purplei2p.i2pd;
import android.os.Build;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
@ -39,12 +40,15 @@ public class MainPreferenceActivity extends PreferenceActivity { @@ -39,12 +40,15 @@ public class MainPreferenceActivity extends PreferenceActivity {
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
{

16
app/src/main/res/layout/activity_main.xml

@ -52,7 +52,7 @@ @@ -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" />
<Space
@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/services"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textColor="#DFDFDF" />
<TableLayout
@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:clickable="false"
android:text="@string/services_http_proxy"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@android:style/TextAppearance.Small"
android:textColor="#DFDFDF" />
</TableRow>
@ -100,7 +100,7 @@ @@ -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" />
</TableRow>
@ -115,7 +115,7 @@ @@ -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" />
</TableRow>
@ -130,7 +130,7 @@ @@ -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" />
</TableRow>
@ -145,11 +145,11 @@ @@ -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" />
</TableRow>
</TableLayout>
</LinearLayout>
</ScrollView>
</ScrollView>

Loading…
Cancel
Save