New release: 233 all

madduck · Nov 5, 2019 · 2e8c3c1 · 2e8c3c1
1 parent b7d39aa
commit 2e8c3c1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/AndroidManifestBadminton.xml b/AndroidManifestBadminton.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.doubleyellow.badminton"
-          android:versionCode="231"
+          android:versionCode="233"
           android:versionName="4.26">
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/AndroidManifestRacketlon.xml b/AndroidManifestRacketlon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.doubleyellow.racketlon"
-          android:versionCode="231"
+          android:versionCode="233"
           android:versionName="4.20">
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/AndroidManifestSquore.xml b/AndroidManifestSquore.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.doubleyellow.scoreboard"
-          android:versionCode="232"
+          android:versionCode="233"
           android:versionName="4.26">
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/AndroidManifestTabletennis.xml b/AndroidManifestTabletennis.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.doubleyellow.tabletennis"
-          android:versionCode="231"
+          android:versionCode="233"
           android:versionName="4.26">
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />

diff --git a/src/com/doubleyellow/scoreboard/model/GameTiming.java b/src/com/doubleyellow/scoreboard/model/GameTiming.java
@@ -63,7 +63,7 @@ public interface OnTimingChangedListener extends Model.OnModelChangeListener {
     public GameTiming(int iGameNrZeroBased, long s, long e) {
         this(iGameNrZeroBased, s,e, null);
     }
-    public int getGameNrZeroBased() {
+    int getGameNrZeroBased() {
         return iGameNrZeroBased;
     }
     GameTiming(int iGameNrZeroBased, long s, long e, List<OnTimingChangedListener> onTimingChangedListeners) {

diff --git a/src/com/doubleyellow/scoreboard/model/Model.java b/src/com/doubleyellow/scoreboard/model/Model.java
@@ -1318,12 +1318,12 @@ public long getDuration() {
         long lEnd = 0;
         if ( lStart == 0 ) {
             // manually entered game durations
-            for(GameTiming gt: m_lGameTimings) {
+            for (int gameNrZeroBased = 0; gameNrZeroBased < ListUtil.size(m_lGameTimings); gameNrZeroBased++) {
+                GameTiming gt = m_lGameTimings.get(gameNrZeroBased);
                 long lDuration = gt.getEnd() - gt.getStart();
                 if ( gt.getStart() > 0 || lDuration > 100 || lDuration == 0 ) {
                     // mixup of gametimings: actual gametimings after demo game timing
                     lDuration = 6;
-                    int gameNrZeroBased = gt.getGameNrZeroBased();
                     gt = new GameTiming(gameNrZeroBased, 0, lDuration);
                     m_lGameTimings.set(gameNrZeroBased, gt);
                 }