bedroomghost/brouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #725 from afischerdev/test-param

Browse Source 
Update gradle and docs
This commit is contained in:
afischerdev 2024-09-04 09:57:18 +02:00 committed by GitHub
commit 6b4d989868
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
View File

@ -487,12 +487,12 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
return checked; return checked;
} }
public void selectProfile(String[] items) { public void selectProfile(String[] items, boolean showDialog) {
availableProfiles = items; availableProfiles = items;
Arrays.sort(availableProfiles); Arrays.sort(availableProfiles);
// show main dialog // show main dialog
showADialog(DIALOG_MAINACTION_ID); if (showDialog) showADialog(DIALOG_MAINACTION_ID);
} }
public void startDownloadManager() { public void startDownloadManager() {

3
brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
View File

@ -250,11 +250,12 @@ public class BRouterView extends View {
}; };
if (!RoutingHelper.hasDirectoryAnyDatafiles(segmentDir)) { if (!RoutingHelper.hasDirectoryAnyDatafiles(segmentDir)) {
((BRouterActivity) getContext()).selectProfile(profiles.toArray(new String[0]), false);
((BRouterActivity) getContext()).startDownloadManager(); ((BRouterActivity) getContext()).startDownloadManager();
waitingForSelection = true; waitingForSelection = true;
return; return;
} }
((BRouterActivity) getContext()).selectProfile(profiles.toArray(new String[0])); ((BRouterActivity) getContext()).selectProfile(profiles.toArray(new String[0]), true);
} catch (Exception e) { } catch (Exception e) {
String msg = e instanceof IllegalArgumentException ? e.getMessage() String msg = e instanceof IllegalArgumentException ? e.getMessage()
+ (cor == null ? "" : " (coordinate-source: " + cor.basedir + cor.rootdir + ")") : e.toString(); + (cor == null ? "" : " (coordinate-source: " + cor.basedir + cor.rootdir + ")") : e.toString();

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.2.2' classpath 'com.android.tools.build:gradle:8.5.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

7
docs/revisions.md
View File

@ -2,6 +2,13 @@
(ZIP-Archives including APK, readme + profiles) (ZIP-Archives including APK, readme + profiles)
### next version
Android
- enable edit for unused profiles
### [brouter-1.7.7.zip](../brouter_bin/brouter-1.7.7.zip) (current revision, 23.07.2024) ### [brouter-1.7.7.zip](../brouter_bin/brouter-1.7.7.zip) (current revision, 23.07.2024)
- new Android API 34 - new Android API 34

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip