linting

mattvchandler · Mar 28, 2019 · 3b68db9 · 3b68db9
1 parent 46a53ee
commit 3b68db9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 ext.ver_major = 1
 ext.ver_minor = 0
-ext.ver_patch = 2
+ext.ver_patch = 3
 ext.min_sdk   = 19
 
 private Integer gen_version_code()
@@ -61,7 +61,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
     implementation 'androidx.preference:preference:1.1.0-alpha04'
-    implementation 'com.google.android.material:material:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha05'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

diff --git a/app/src/main/cpp/engine.cpp b/app/src/main/cpp/engine.cpp
@@ -426,6 +426,10 @@ void Engine::stop() noexcept
     {
         LOG_ERROR_PRINT("Engine::stop", "could not serialize data: %s", e.what());
     }
+    catch(...)
+    {
+        LOG_ERROR_WRITE("Engine::stop", "unknown exception when opening savefile");
+    }
 }
 void Engine::set_focus(bool focus) noexcept
 {

diff --git a/app/src/main/java/MainActivity.kt b/app/src/main/java/MainActivity.kt
@@ -386,7 +386,7 @@ class MainActivity: Themed_activity(), SurfaceHolder.Callback
 
             R.id.help ->
             {
-                val toast_delay = 4000L; // ms
+                val toast_delay = 4000L // ms
                 Toast.makeText(this, resources.getString(R.string.help_general), Toast.LENGTH_LONG).show()
                 // TODO: using a delayed handler as a workaround for bug in android: https://issuetracker.google.com/issues/79159357
                 // remove when bug is resolved
@@ -395,7 +395,7 @@ class MainActivity: Themed_activity(), SurfaceHolder.Callback
                         Toast.makeText(this, resources.getString(R.string.help_accel), Toast.LENGTH_LONG).show()
                     else
                         Toast.makeText(this, resources.getString(R.string.help_touch), Toast.LENGTH_LONG).show()
-                }, toast_delay);
+                }, toast_delay)
                 true
             }