diff --git a/.gitignore b/.gitignore index 2fd6475..874d05e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ captures/ .navigation/ captures/ proguard/ +app/release/ app/src/main/*.xml app/src/main/res/values/*.xml diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 649e6d1..11a67c3 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,15 +18,21 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +#-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile +# hide the original source file name. +#-renamesourcefileattribute SourceFile -keepattributes Signature --keepattributes *Annotation* -# FireBase Ignore --keep class com.caden.drawing.wurmpaint.Wurm { *; } --Keep class com.caden.drawing.wurmpaint.DrawModel.LineElem { *; } --keep class com.google.firebase.** { *; } \ No newline at end of file +-keepattributes *Annotation* + +# Keep these files that FireBase need to correctly send and receive data +-keep class com.google.firebase.** { *; } +-keep class com.caden.drawing.wurmpaint.** { *; } +#-keep class com.caden.drawing.wurmpaint.DrawModel.** { *; } +#-keep class com.caden.drawing.wurmpaint.DrawRenderer.** { *; } +#-keep class com.caden.drawing.wurmpaint.DrawView.** { *; } +#-keep class com.caden.drawing.wurmpaint.Wurm.** { *; } +#-keep class com.caden.drawing.wurmpaint.DrawingActivity.** { *; } +#-keep class com.caden.drawing.wurmpaint.SharedData.** { *; } \ No newline at end of file diff --git a/app/release/output.json b/app/release/output.json index e02f413..e997b72 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9},"path":"app-release.apk","properties":{"packageId":"com.caden.drawing.wurmpaint","split":"","minSdkVersion":"21"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"2.07","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/caden/drawing/wurmpaint/LoginActivity.java b/app/src/main/java/com/caden/drawing/wurmpaint/LoginActivity.java index c3adb86..97fce83 100644 --- a/app/src/main/java/com/caden/drawing/wurmpaint/LoginActivity.java +++ b/app/src/main/java/com/caden/drawing/wurmpaint/LoginActivity.java @@ -86,6 +86,9 @@ public boolean onCreateOptionsMenu(Menu menu) { return true; } + @Override + public void onBackPressed() {} + @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.menu_info) {