Skip to content

Commit 1e8fab6

Browse files
Bugfix
1 parent f2f290e commit 1e8fab6

File tree

98 files changed

+139
-128
lines changed

Some content is hidden

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

98 files changed

+139
-128
lines changed
Binary file not shown.
Binary file not shown.

.gradle/6.5/fileHashes/fileHashes.bin

100 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
4.33 KB
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "berthold.beamcalc"
77
minSdkVersion 23
88
targetSdkVersion 30
9-
versionCode 22
10-
versionName "2.2"
9+
versionCode 23
10+
versionName "2.3"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {

app/build/generated/source/buildConfig/release/berthold/beamcalc/BuildConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public final class BuildConfig {
77
public static final boolean DEBUG = false;
88
public static final String APPLICATION_ID = "berthold.beamcalc";
99
public static final String BUILD_TYPE = "release";
10-
public static final int VERSION_CODE = 22;
11-
public static final String VERSION_NAME = "2.2";
10+
public static final int VERSION_CODE = 23;
11+
public static final String VERSION_NAME = "2.3";
1212
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Sun Mar 06 19:52:45 CET 2022
1+
#Sun Mar 06 21:00:46 CET 2022
22
base.0=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
33
path.1=classes.dex
44
renamed.1=classes2.dex
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Sun Mar 06 20:15:42 CET 2022
1+
#Sun Mar 06 21:03:49 CET 2022
22
base.0=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/dex/release/mergeDexRelease/classes.dex
33
path.0=classes.dex
44
renamed.0=classes.dex
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

Lines changed: 84 additions & 83 deletions
Large diffs are not rendered by default.

app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
1<?xml version="1.0" encoding="utf-8"?>
22
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
3 package="berthold.beamcalc"
4-
4 android:versionCode="22"
5-
5 android:versionName="2.2" >
4+
4 android:versionCode="23"
5+
5 android:versionName="2.3" >
66
6
77
7 <uses-sdk
88
8 android:minSdkVersion="23"

app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
android:icon="@mipmap/icon"
2626
android:label="@string/app_name"
2727
android:supportsRtl="true"
28+
android:testOnly="true"
2829
android:theme="@style/AppTheme" >
2930
<activity
3031
android:name="berthold.beamcalc.MainActivity"

app/build/intermediates/merged_manifest/release/out/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="berthold.beamcalc"
4-
android:versionCode="22"
5-
android:versionName="2.2" >
4+
android:versionCode="23"
5+
android:versionName="2.3" >
66

77
<uses-sdk
88
android:minSdkVersion="23"

app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
android:icon="@mipmap/icon"
2626
android:label="@string/app_name"
2727
android:supportsRtl="true"
28+
android:testOnly="true"
2829
android:theme="@style/AppTheme" >
2930
<activity
3031
android:name="berthold.beamcalc.MainActivity"

app/build/intermediates/merged_manifests/release/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="berthold.beamcalc"
4-
android:versionCode="22"
5-
android:versionName="2.2" >
4+
android:versionCode="23"
5+
android:versionName="2.3" >
66

77
<uses-sdk
88
android:minSdkVersion="23"

app/build/intermediates/merged_manifests/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 22,
14-
"versionName": "2.2",
13+
"versionCode": 23,
14+
"versionName": "2.3",
1515
"outputFile": "AndroidManifest.xml"
1616
}
1717
]

app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
android:icon="@mipmap/icon"
2626
android:label="@string/app_name"
2727
android:supportsRtl="true"
28+
android:testOnly="true"
2829
android:theme="@style/AppTheme" >
2930
<activity
3031
android:name="berthold.beamcalc.MainActivity"

app/build/intermediates/packaged_manifests/release/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="berthold.beamcalc"
4-
android:versionCode="22"
5-
android:versionName="2.2" >
4+
android:versionCode="23"
5+
android:versionName="2.3" >
66

77
<uses-sdk
88
android:minSdkVersion="23"

app/build/intermediates/packaged_manifests/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 22,
14-
"versionName": "2.2",
13+
"versionCode": 23,
14+
"versionName": "2.3",
1515
"outputFile": "AndroidManifest.xml"
1616
}
1717
]
Binary file not shown.

app/build/intermediates/processed_res/release/out/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 22,
14-
"versionName": "2.2",
13+
"versionCode": 23,
14+
"versionName": "2.3",
1515
"outputFile": "resources-release.ap_"
1616
}
1717
]
Binary file not shown.
-28.8 KB
Binary file not shown.
Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
berthold/beamcalc/BeamLoadListAdapter.java
2-
berthold.beamcalc.BeamLoadListAdapter
3-
berthold.beamcalc.BeamLoadListAdapter$1
4-
berthold.beamcalc.BeamLoadListAdapter$2
5-
berthold.beamcalc.BeamLoadListAdapter$MyViewHolder
1+
berthold/beamcalc/FragmentLoadInput.java
2+
berthold.beamcalc.FragmentLoadInput
3+
berthold.beamcalc.FragmentLoadInput$1
4+
berthold.beamcalc.FragmentLoadInput$2
5+
berthold.beamcalc.FragmentLoadInput$getDataFromFragment
66
berthold/beamcalc/ConvertLoadListObject.java
77
berthold.beamcalc.ConvertLoadListObject
88
berthold/beamcalc/CheckForNetwork.java
@@ -16,27 +16,21 @@ berthold/beamcalc/MyBitmapTools.java
1616
berthold.beamcalc.MyBitmapTools
1717
berthold/beamcalc/GetThisAppsVersion.java
1818
berthold.beamcalc.GetThisAppsVersion
19-
berthold/beamcalc/InfoActivity.java
20-
berthold.beamcalc.InfoActivity
21-
berthold.beamcalc.InfoActivity$1
22-
berthold.beamcalc.InfoActivity$1$1
23-
berthold.beamcalc.InfoActivity$2
24-
berthold.beamcalc.InfoActivity$2$1
25-
berthold/beamcalc/BuildConfig.java
26-
berthold.beamcalc.BuildConfig
2719
berthold/beamcalc/SaveBeamDrawing.java
2820
berthold.beamcalc.SaveBeamDrawing
2921
berthold.beamcalc.SaveBeamDrawing$1
3022
berthold.beamcalc.SaveBeamDrawing$2
31-
berthold/beamcalc/VersionChecker.java
32-
berthold.beamcalc.VersionChecker
33-
berthold/beamcalc/FragmentLoadInput.java
34-
berthold.beamcalc.FragmentLoadInput
35-
berthold.beamcalc.FragmentLoadInput$1
36-
berthold.beamcalc.FragmentLoadInput$2
37-
berthold.beamcalc.FragmentLoadInput$getDataFromFragment
23+
berthold/beamcalc/BuildConfig.java
24+
berthold.beamcalc.BuildConfig
3825
berthold/beamcalc/ShowResult.java
3926
berthold.beamcalc.ShowResult
27+
berthold/beamcalc/VersionChecker.java
28+
berthold.beamcalc.VersionChecker
29+
berthold/beamcalc/BeamLoadListAdapter.java
30+
berthold.beamcalc.BeamLoadListAdapter
31+
berthold.beamcalc.BeamLoadListAdapter$1
32+
berthold.beamcalc.BeamLoadListAdapter$2
33+
berthold.beamcalc.BeamLoadListAdapter$MyViewHolder
4034
berthold/beamcalc/MainActivity.java
4135
berthold.beamcalc.MainActivity
4236
berthold.beamcalc.MainActivity$1
@@ -46,3 +40,10 @@ berthold/beamcalc/MainActivity.java
4640
berthold.beamcalc.MainActivity$5
4741
berthold.beamcalc.MainActivity$6
4842
berthold.beamcalc.MainActivity$7
43+
berthold/beamcalc/InfoActivity.java
44+
berthold.beamcalc.InfoActivity
45+
berthold.beamcalc.InfoActivity$1
46+
berthold.beamcalc.InfoActivity$1$1
47+
berthold.beamcalc.InfoActivity$1$2
48+
berthold.beamcalc.InfoActivity$2
49+
berthold.beamcalc.InfoActivity$2$1

app/build/tmp/compileReleaseJavaWithJavac/source-classes-mapping.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ berthold/beamcalc/InfoActivity.java
4444
berthold.beamcalc.InfoActivity
4545
berthold.beamcalc.InfoActivity$1
4646
berthold.beamcalc.InfoActivity$1$1
47+
berthold.beamcalc.InfoActivity$1$2
4748
berthold.beamcalc.InfoActivity$2
4849
berthold.beamcalc.InfoActivity$2$1

app/release/app-release.apk

-242 Bytes
Binary file not shown.

app/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 22,
14-
"versionName": "2.2",
13+
"versionCode": 23,
14+
"versionName": "2.3",
1515
"outputFile": "app-release.apk"
1616
}
1717
]

app/src/main/java/berthold/beamcalc/InfoActivity.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,13 @@ public void run() {
8383
final String latestVersionInGooglePlay = getAppVersionfromGooglePlay(getApplicationContext());
8484

8585
if (latestVersionInGooglePlay.equals(currentVersion)) {
86-
//updateInfoView.setText(getResources().getText(R.string.version_info_is_latest_version));
87-
updateInfoView.setText(HtmlCompat.fromHtml(getResources().getText(R.string.version_info_ok) + "", 0));
86+
handler.post(new Runnable() {
87+
@Override
88+
public void run() {
89+
//updateInfoView.setText(getResources().getText(R.string.version_info_is_latest_version));
90+
updateInfoView.setText(HtmlCompat.fromHtml(getResources().getText(R.string.version_info_ok) + "", 0));
91+
}
92+
});
8893
} else {
8994
handler.post(new Runnable() {
9095
@Override

app/src/main/java/berthold/beamcalc/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected void onCreate(Bundle savedInstanceState) {
101101
// Check for permissions.
102102
// The permissions to be checked have to be defined inside the manifest file.
103103
//
104-
String[] perms = {"android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"};
104+
String[] perms = {"android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE,","android.permission.ACCESS_NETWORK_STATE"};
105105
int permsRequestCode = PERMISSION_REQUEST;
106106

107107
// Opens a system dialog requesting permissions, if none of the

0 commit comments

Comments
 (0)