Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #99. Tested by sam #105

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #99. Tested by sam #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28b2036
*.tmp to gitignore
nonlin-lin-chaos-order-etc-etal Jan 20, 2025
5601d86
Fix #99. Untested
nonlin-lin-chaos-order-etc-etal Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ build
*.iml
*.local
*.jks
*.tmp
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ This repository contains Android application sources of i2pd

### Install g++, OpenJDK 11+, gradle 5.1+

* <i>Note:</i> openjdk 17 has also been tested okay.

```bash
sudo apt-get install g++ openjdk-11-jdk gradle
```
Expand Down Expand Up @@ -58,7 +60,7 @@ pushd binary/jni
./build.sh -d
popd

gradle clean assembleDebug
./gradlew clean assembleDebug
```

You will find APKs in `app/build/outputs/apk`
Expand Down
16 changes: 9 additions & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,12 @@ dependencies {
}

android {
lintOptions {
// Not so a good way
disable 'DuplicatePlatformClasses'
}

compileSdkVersion 33
// do not remove, it is deprecated & nevertheless required
compileSdkVersion 35

defaultConfig {
applicationId "org.purplei2p.i2pd"
targetSdkVersion 33
targetSdkVersion 35
// TODO: 24?
minSdkVersion 16
versionCode 2550000
Expand Down Expand Up @@ -89,6 +85,12 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}
namespace 'org.purplei2p.i2pd'
lint {
disable 'DuplicatePlatformClasses'
}
buildFeatures {
buildConfig = true
}
}

ext.abiCodes = ['armeabi-v7a': 1, 'x86': 2, 'arm64-v8a': 3, 'x86_64': 4]
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
public class I2PDPermsAskerActivity extends Activity {

private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 0;
private static final int PERMISSION_MANAGE_EXTERNAL_STORAGE = 0;

private Button button_request_write_ext_storage_perms;
private TextView textview_retry;

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.7.0'
}
}

Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2048m "-XX:MaxMetaspaceSize=1024m"
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading