WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 9494f28

Browse files
PhilippCPhilippC
committed
Merge branch 'anttiharju/master' into update-libs-and-tools
2 parents a98cd33 + 65092dc commit 9494f28

File tree

3 files changed

+36
-37
lines changed

3 files changed

+36
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ jobs:
1010
# runs-on: macos-12
1111

1212
# steps:
13-
# - uses: actions/checkout@v3
14-
15-
# - name: Fetch submodules
16-
# run: git submodule init && git submodule update
13+
# - uses: actions/checkout@v4
14+
# with:
15+
# submodules: true
1716

1817
# - name: Setup Gradle
19-
# uses: gradle/gradle-build-action@v2
18+
# uses: gradle/actions/setup-gradle@v3
2019

2120
# - name: Cache NuGet packages
22-
# uses: actions/cache@v3
21+
# uses: actions/cache@v4
2322
# with:
2423
# path: ~/.nuget/packages
2524
# key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
@@ -52,7 +51,7 @@ jobs:
5251
# # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
5352

5453
# - name: Switch to JDK-11
55-
# uses: actions/setup-java@v3
54+
# uses: actions/setup-java@v4
5655
# with:
5756
# java-version: '11'
5857
# distribution: 'temurin'
@@ -82,7 +81,7 @@ jobs:
8281
# make apk Flavor=Net
8382

8483
# - name: Archive production artifacts (net)
85-
# uses: actions/upload-artifact@v3
84+
# uses: actions/upload-artifact@v4
8685
# with:
8786
# name: signed APK ('net' built on ${{ github.job }})
8887
# path: |
@@ -100,7 +99,7 @@ jobs:
10099
# make apk Flavor=NoNet
101100

102101
# - name: Archive production artifacts (nonet)
103-
# uses: actions/upload-artifact@v3
102+
# uses: actions/upload-artifact@v4
104103
# with:
105104
# name: signed APK ('nonet' built on ${{ github.job }})
106105
# path: |
@@ -130,16 +129,15 @@ jobs:
130129
# # Build Artifact of xamarin.android-oss dated 2022-02-16, master branch (= version 12.2.99)
131130
# xamarin_url: https://artprodcus3.artifacts.visualstudio.com/Ad0adf05a-e7d7-4b65-96fe-3f3884d42038/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL3hhbWFyaW4vcHJvamVjdElkLzZmZDNkODg2LTU3YTUtNGUzMS04ZGI3LTUyYTFiNDdjMDdhOC9idWlsZElkLzU0OTUzL2FydGlmYWN0TmFtZS9pbnN0YWxsZXJzLXVuc2lnbmVkKy0rTGludXg1/content?format=zip
132131
# steps:
133-
# - uses: actions/checkout@v3
134-
135-
# - name: Fetch submodules
136-
# run: git submodule init && git submodule update
132+
# - uses: actions/checkout@v4
133+
# with:
134+
# submodules: true
137135

138136
# - name: Setup Gradle
139-
# uses: gradle/gradle-build-action@v2
137+
# uses: gradle/actions/setup-gradle@v3
140138

141139
# - name: Cache NuGet packages
142-
# uses: actions/cache@v3
140+
# uses: actions/cache@v4
143141
# with:
144142
# path: ~/.nuget/packages
145143
# key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
@@ -148,7 +146,7 @@ jobs:
148146

149147
# - name: Cache Xamarin.Android packages
150148
# id: xamarin_cache
151-
# uses: actions/cache@v3
149+
# uses: actions/cache@v4
152150
# with:
153151
# path: ~/xamarin.android-oss
154152
# key: ${{ runner.os }}-xamarin.android-oss-${{ env.xamarin_url }}
@@ -183,7 +181,7 @@ jobs:
183181
# echo "$HOME/xamarin.android-oss/bin/Release/bin" >> $GITHUB_PATH
184182

185183
# - name: Switch to JDK-11
186-
# uses: actions/setup-java@v3
184+
# uses: actions/setup-java@v4
187185
# with:
188186
# java-version: '11'
189187
# distribution: 'temurin'
@@ -217,7 +215,7 @@ jobs:
217215
# make apk Flavor=Net
218216

219217
# - name: Archive production artifacts (net)
220-
# uses: actions/upload-artifact@v3
218+
# uses: actions/upload-artifact@v4
221219
# with:
222220
# name: signed APK ('net' built on ${{ github.job }})
223221
# path: |
@@ -235,7 +233,7 @@ jobs:
235233
# make apk Flavor=NoNet
236234

237235
# - name: Archive production artifacts (nonet)
238-
# uses: actions/upload-artifact@v3
236+
# uses: actions/upload-artifact@v4
239237
# with:
240238
# name: signed APK ('nonet' built on ${{ github.job }})
241239
# path: |
@@ -254,37 +252,36 @@ jobs:
254252
runs-on: windows-2022
255253

256254
steps:
257-
- uses: actions/checkout@v3
255+
- uses: actions/checkout@v4
256+
with:
257+
submodules: true
258258

259259
- name: Setup Gradle
260-
uses: gradle/gradle-build-action@v2
260+
uses: gradle/actions/setup-gradle@v3
261261

262262
- name: Cache NuGet packages
263-
uses: actions/cache@v3
263+
uses: actions/cache@v4
264264
with:
265265
path: ~/.nuget/packages
266266
key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
267267
restore-keys: |
268268
${{ runner.os }}-nuget-
269269
270-
- name: Fetch submodules
271-
run: git submodule init && git submodule update
272-
273270
# Workaround an issue when building on windows-2022. Error was
274271
# D8 : OpenJDK 64-Bit Server VM warning : INFO: os::commit_memory(0x00000000ae400000, 330301440, 0) failed; error='The paging file is too small for this operation to complete' (DOS error/errno=1455) [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
275272
# C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Xamarin\Android\Xamarin.Android.D8.targets(81,5): error MSB6006: "java.exe" exited with code 1. [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
276273
- name: Configure Pagefile
277-
uses: al-cheb/configure-pagefile-action@v1.3
274+
uses: al-cheb/configure-pagefile-action@a3b6ebd6b634da88790d9c58d4b37a7f4a7b8708 # v1.4
278275
with:
279276
minimum-size: 8GB
280277

281278
- name: Add msbuild to PATH
282-
uses: microsoft/setup-msbuild@v1.1
279+
uses: microsoft/setup-msbuild@v2
283280
# If we want to also have nmake, use this instead
284281
#uses: ilammy/msvc-dev-cmd@v1
285282

286283
- name: Switch to JDK-11
287-
uses: actions/setup-java@v3
284+
uses: actions/setup-java@v4
288285
with:
289286
java-version: '11'
290287
distribution: 'temurin'
@@ -320,7 +317,7 @@ jobs:
320317
make apk Flavor=Net
321318
322319
- name: Archive production artifacts (net)
323-
uses: actions/upload-artifact@v3
320+
uses: actions/upload-artifact@v4
324321
with:
325322
name: signed APK ('net' built on ${{ github.job }})
326323
path: |
@@ -341,7 +338,7 @@ jobs:
341338
make apk Flavor=NoNet
342339
343340
- name: Archive production artifacts (nonet)
344-
uses: actions/upload-artifact@v3
341+
uses: actions/upload-artifact@v4
345342
with:
346343
name: signed APK ('nonet' built on ${{ github.job }})
347344
path: |

‎src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@
145145
import java.util.List;
146146

147147
//import keepass2android.javafilestorage.DropboxCloudRailStorage;
148+
import keepass2android.javafilestorage.DropboxV2Storage;
148149
import keepass2android.javafilestorage.GoogleDriveAppDataFileStorage;
150+
import keepass2android.javafilestorage.ICertificateErrorHandler;
149151
import keepass2android.javafilestorage.JavaFileStorage;
150152
import keepass2android.javafilestorage.JavaFileStorage.FileEntry;
151153
import keepass2android.javafilestorage.PCloudFileStorage;
@@ -347,7 +349,7 @@ protected Void doInBackground(Object... params) {
347349
fileList = fs.listFiles(path);
348350
checkFileList(path, fileList, false, true); //second param indicates the file must be gone
349351

350-
Log.d("KP2AJ", "Delete a folder recursive");
352+
Log.d("KP2AJ", "xDelete a folder recursive: " + subfolderPath);
351353
fs.delete(subfolderPath);
352354

353355
Log.d("KP2AJ", "List files again to check if deleting the folder was successful:");
@@ -540,12 +542,12 @@ public void run() {
540542

541543
static JavaFileStorage createStorageToTest(Context ctx, Context appContext, boolean simulateRestart) {
542544
//storageToTest = new SftpStorage(ctx.getApplicationContext());
543-
storageToTest = new PCloudFileStorage(ctx, "FLm22de7bdS", "pcloud", "pcloudtest");
545+
//storageToTest = new PCloudFileStorage(ctx, "FLm22de7bdS", "pcloud", "pcloudtest");
544546
//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
545547

546548

547549
//storageToTest = new GoogleDriveAppDataFileStorage();
548-
/*storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
550+
storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
549551
@Override
550552
public boolean onValidationError(String error) {
551553
return false;
@@ -555,7 +557,7 @@ public boolean onValidationError(String error) {
555557
public boolean alwaysFailOnValidationError() {
556558
return false;
557559
}
558-
});*/
560+
});
559561

560562
//storageToTest = new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
561563
//storageToTest = new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);

‎src/java/JavaFileStorageTest-AS/app/src/main/res/layout/webdav_credentials.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
android:layout_height="wrap_content"
1616
android:singleLine="true"
1717
android:inputType="textNoSuggestions"
18-
android:text="https://daigers.diskstation.me:5006/Keepass2Android/Apps/Keepass2Android/"
18+
android:text="https://webdav.hidrive.ionos.com/users/philippcro"
1919
android:hint="Server URL" />
2020
</LinearLayout>
2121
<EditText
2222
android:id="@+id/user"
2323
android:layout_width="fill_parent"
2424
android:layout_height="wrap_content"
2525
android:singleLine="true"
26-
android:text="Keepass"
26+
android:text="PhilippCro"
2727
android:hint="@string/hint_username" />
2828

2929
<EditText
@@ -32,7 +32,7 @@
3232
android:layout_height="wrap_content"
3333
android:inputType="textPassword"
3434
android:singleLine="true"
35-
android:text="$T3st17$"
35+
android:text="WSBa1wh4o4YyLK"
3636
android:hint="@string/hint_pass"
3737
android:importantForAccessibility="no" />
3838

0 commit comments

Comments
 (0)