Skip to content

Commit 502b54e

Browse files
authored
Merge pull request #525 from doubleangels/dev
Bug fixes, performance improvements, addition of blur during lock, translation improvements, and dependency updates
2 parents 806eeec + a586547 commit 502b54e

File tree

51 files changed

+1058
-762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1058
-762
lines changed

.github/workflows/create-sentry-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
fetch-depth: 0
1616

.github/workflows/deploy.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1212

1313
- name: Set up JDK 21
14-
uses: actions/setup-java@v4
14+
uses: actions/setup-java@v5
1515
with:
1616
java-version: "21"
1717
distribution: "temurin"
@@ -56,10 +56,10 @@ jobs:
5656
runs-on: ubuntu-latest
5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v5
6060

6161
- name: Set up JDK 21
62-
uses: actions/setup-java@v4
62+
uses: actions/setup-java@v5
6363
with:
6464
java-version: "21"
6565
distribution: "temurin"
@@ -104,10 +104,10 @@ jobs:
104104
runs-on: ubuntu-latest
105105
steps:
106106
- name: Checkout
107-
uses: actions/checkout@v4
107+
uses: actions/checkout@v5
108108

109109
- name: Set up JDK 21
110-
uses: actions/setup-java@v4
110+
uses: actions/setup-java@v5
111111
with:
112112
java-version: 21
113113
distribution: "temurin"
@@ -156,22 +156,22 @@ jobs:
156156
runs-on: ubuntu-latest
157157
steps:
158158
- name: Checkout
159-
uses: actions/checkout@v4
159+
uses: actions/checkout@v5
160160

161161
- name: Download APK from Github release artifacts
162-
uses: actions/download-artifact@v4
162+
uses: actions/download-artifact@v5
163163
with:
164164
name: github-release-apk
165165
path: .
166166

167167
- name: Download foss APK from Github release artifacts
168-
uses: actions/download-artifact@v4
168+
uses: actions/download-artifact@v5
169169
with:
170170
name: github-foss-release-apk
171171
path: .
172172

173173
- name: Download Google Play bundle from Github release artifacts
174-
uses: actions/download-artifact@v4
174+
uses: actions/download-artifact@v5
175175
with:
176176
name: google-play-bundle
177177
path: .
@@ -242,10 +242,10 @@ jobs:
242242
runs-on: ubuntu-latest
243243
steps:
244244
- name: Checkout
245-
uses: actions/checkout@v4
245+
uses: actions/checkout@v5
246246

247247
- name: Download APK from Github release artifacts
248-
uses: actions/download-artifact@v4
248+
uses: actions/download-artifact@v5
249249
with:
250250
name: github-release-apk
251251
path: .

.github/workflows/test-dependabot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717

1818
- name: Set up JDK 21
19-
uses: actions/setup-java@v4
19+
uses: actions/setup-java@v5
2020
with:
2121
java-version: "21"
2222
distribution: "temurin"
@@ -43,10 +43,10 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v5
4747

4848
- name: Set up JDK 21
49-
uses: actions/setup-java@v4
49+
uses: actions/setup-java@v5
5050
with:
5151
java-version: "21"
5252
distribution: "temurin"

.github/workflows/test-dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Set up JDK 21
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
java-version: "21"
2020
distribution: "temurin"
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3535

3636
- name: Set up JDK 21
37-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
3838
with:
3939
java-version: "21"
4040
distribution: "temurin"

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

app/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
22
id "com.android.application"
3-
id "io.sentry.android.gradle" version "5.8.0"
3+
id "io.sentry.android.gradle" version "5.11.0"
44
id "com.google.gms.google-services"
55
}
66

77
android {
8-
compileSdk = 35
8+
compileSdk = 36
99
defaultConfig {
1010
applicationId "com.doubleangels.nextdnsmanagement"
1111
minSdkVersion 32
1212
targetSdk = 35
13-
versionCode 263
14-
versionName "5.5.14"
13+
versionCode 264
14+
versionName "5.5.15"
1515
resourceConfigurations += ["en", "zh", "nl", "fi", "fr", "de", "in", "it", "ja", "pl", "pt", "es", "sv", "tr"]
1616
}
1717

@@ -63,17 +63,17 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation "androidx.activity:activity:1.10.1"
67-
implementation 'androidx.appcompat:appcompat:1.7.0'
66+
implementation "androidx.activity:activity:1.11.0"
67+
implementation 'androidx.appcompat:appcompat:1.7.1'
6868
implementation "androidx.biometric:biometric:1.4.0-alpha04"
6969
implementation 'androidx.preference:preference:1.2.1'
7070
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
71-
implementation 'androidx.webkit:webkit:1.13.0'
72-
implementation 'com.google.android.material:material:1.12.0'
73-
gmsImplementation 'com.google.firebase:firebase-messaging:24.1.1'
71+
implementation 'androidx.webkit:webkit:1.14.0'
72+
implementation 'com.google.android.material:material:1.13.0'
73+
gmsImplementation 'com.google.firebase:firebase-messaging:25.0.0'
7474
implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
7575
implementation 'de.hdodenhof:circleimageview:3.1.0'
76-
implementation 'io.sentry:sentry-android:8.14.0'
76+
implementation 'io.sentry:sentry-android:8.21.1'
7777
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
7878
}
7979

app/src/foss/java/com/doubleangels/nextdnsmanagement/CustomFirebaseMessagingService.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,26 @@
99
/**
1010
* A simple Service implementation for Firebase Messaging.
1111
* <p>
12-
* This service currently does not perform any messaging functions and is set up to not restart if terminated.
12+
* This service currently does not perform any messaging functions and is set up
13+
* to not restart if terminated.
1314
* </p>
1415
*/
1516
public class CustomFirebaseMessagingService extends Service {
1617

1718
/**
1819
* Called when the service is started.
19-
* Returns START_NOT_STICKY so that the service is not recreated after being killed.
20+
* Returns START_NOT_STICKY so that the service is not recreated after being
21+
* killed.
2022
*
2123
* @param intent The Intent supplied to startService(Intent), as given.
2224
* @param flags Additional data about this start request.
2325
* @param startId A unique integer representing this specific request to start.
24-
* @return The mode in which to continue running; START_NOT_STICKY indicates not to restart.
26+
* @return The mode in which to continue running; START_NOT_STICKY indicates not
27+
* to restart.
2528
*/
2629
@Override
2730
public int onStartCommand(Intent intent, int flags, int startId) {
28-
// Return START_NOT_STICKY to prevent the service from restarting automatically.
31+
// Return START_NOT_STICKY to prevent the service from restarting automatically
2932
return START_NOT_STICKY;
3033
}
3134

@@ -35,7 +38,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
3538
@Override
3639
public void onCreate() {
3740
super.onCreate();
38-
// Additional initialization can be done here if needed.
41+
// Additional initialization can be done here if needed
3942
}
4043

4144
/**
@@ -47,7 +50,7 @@ public void onCreate() {
4750
@Nullable
4851
@Override
4952
public IBinder onBind(Intent intent) {
50-
// Binding is not implemented in this service.
53+
// Binding is not implemented in this service
5154
return null;
5255
}
5356
}

0 commit comments

Comments
 (0)