Merge pull request #8 from Trumeet/canary

Canary

Author: Trumeet

.travis.yml

@@ -28,7 +28,7 @@ before_deploy:
 - export VERSION_CODE=$(cat version_code.txt)
 - git tag $VERSION_CODE
 # Rename
-- mv "app/build/outputs/apk/release/app-release.apk" "app/build/outputs/apk/release/app.apk"
+- mv "app/build/outputs/apk/release/app-release.apk" "app/build/outputs/apk/release/app-${VERSION}.apk"
 deploy:
   name: ${VERSION}
   body: Snapshot version automatically generated by Travis CI. Please be cautious to experience due to potential bugs.
@@ -37,6 +37,6 @@ deploy:
   skip_cleanup: true
   api_key:
     secure: rvV6A3CKwvyo0rUHYq3kHLzEukLZaT4Dddqn1tK7MSoD33MZqTo5VKtS6p+bKFQzI6aqdpDl9eminv9HsYO9ogtIRP5GuPhi+UMNX/RNC3ISwgPjMT0WkZKovNqfQxr2QLrg95NrdI+tZ4MPAlprtAB6onkFcssS6pPsm3UZ/RAB0s5PT/+pBVIplWD93hx805s1Soijg4T22HyYvLr26ZqcHud2lx6ams1GT73ZAxx5HZHQYBKJvp4Qnsh16XWlvQCTMc7kCS8O1xFCpN33BDpcBeoCynhO5zIV7V7y9S6RtfnJMoSGjCoaPOAJdPRgqWgyfZCCdLoJBRO7Ig2IAKNNENaSwvsDsTm2nQ3DbYcVY6aRX+s1m2Vysvh3pxkxNaKTl58pXsTlEdYvTFJ1Bd1Y3m6E3Y9k7UiRsSw2PAcA4iRCAU3WaSgekJ03uOMQoZUT5xAiRfTORL4cv5TMKwWq7dl7gn2Ild1sb3ajT1JgNLVyTKrzG4qgxnIWyS28pLosTRurabheA6JbkM1PGuUyLUkh1UBQ2WkoKUjUaJ9v6+XmT6NdFD70ukdeE9QijVq1SlvIDX/iPCkSsY6fMlM18bfkO44AhYvkNow6uMIoKrZf5E1izIkwGAeGlDB/aqxpZHcW7zgkpys/q6MWSfwxcY2eIZUi7V9Epr0kGi0=
-  file: app/build/outputs/apk/release/app.apk
+  file: app/build/outputs/apk/release/app-${VERSION}.apk
   on:
     repo: Trumeet/MiPushTester

Dockerfile

@@ -7,10 +7,11 @@ WORKDIR /app/server
 RUN apk add git && \
     chmod +x ./gradlew && \
     rm -rf app/ && \
-    ./gradlew --no-daemon :server:shadowJar && \
-    mv server/build/libs/server-1.0-all.jar /server.jar
+    ./gradlew :common:build && \
+    ./gradlew :server:jar && \
+    mv server/build/libs/server-1.0.jar /server.jar
 
 FROM openjdk:8u171-jre-alpine3.8 as environment
 WORKDIR /app
 COPY --from=builder /server.jar .
-ENTRYPOINT java -jar /app/server.jar
+ENTRYPOINT java -jar /app/server.jar

app/build.gradle

@@ -1,4 +1,7 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 if (file("play-store-api.json").exists()) {
@@ -80,6 +83,9 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    kapt {
+        generateStubs = true
+    }
 }
 
 dependencies {
@@ -112,4 +118,8 @@ dependencies {
     implementation 'com.elvishew:xlog:1.6.1'
     // Common
     implementation project(':common')
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    kapt 'com.android.databinding:compiler:3.1.4'
 }

app/proguard-rules.pro

@@ -2,6 +2,9 @@
 -keep class moe.yuuta.mipushtester.push.PushReceiver {*;}
 -dontwarn com.xiaomi.push.**
 -dontwarn com.xiaomi.mipush.**
+-keepclassmembers class com.xiaomi.mipush.sdk.MiPushMessage {
+    private <fields>;
+}
 
 # OkHttp3 rules comes from https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro
 -dontwarn javax.annotation.**

app/src/main/java/moe/yuuta/mipushtester/App.java

@@ -0,0 +1,66 @@
+package moe.yuuta.mipushtester
+
+import android.app.Application
+import android.os.SystemClock
+import com.crashlytics.android.Crashlytics
+import com.crashlytics.android.answers.Answers
+import com.elvishew.xlog.LogConfiguration
+import com.elvishew.xlog.XLog
+import com.elvishew.xlog.formatter.message.json.DefaultJsonFormatter
+import com.elvishew.xlog.printer.AndroidPrinter
+import com.elvishew.xlog.printer.file.FilePrinter
+import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy
+import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
+import com.xiaomi.channel.commonutils.logger.LoggerInterface
+import com.xiaomi.mipush.sdk.Logger
+import io.fabric.sdk.android.Fabric
+import moe.yuuta.mipushtester.log.LogUtils
+
+class App : Application() {
+    @Override
+    override fun onCreate() {
+        super.onCreate()
+        val logConfiguration = LogConfiguration.Builder()
+                .tag("MiPushTester")
+                .jsonFormatter(DefaultJsonFormatter())
+                .build()
+        val androidPrinter = AndroidPrinter()
+        val filePrinter = FilePrinter.Builder(LogUtils.getLogFolder(this))
+                .fileNameGenerator(DateFileNameGenerator())
+                .cleanStrategy(FileLastModifiedCleanStrategy(1000 * 60 * 60 * 24 * 5))
+                .build()
+        XLog.init(logConfiguration, androidPrinter, filePrinter)
+
+        if (!BuildConfig.DEBUG && !BuildConfig.FABRIC_KEY.equals("disabled")) {
+            Fabric.with(this, Crashlytics(), Answers())
+        }
+        val currentHandler = Thread.getDefaultUncaughtExceptionHandler()
+        Thread.setDefaultUncaughtExceptionHandler(object : Thread.UncaughtExceptionHandler {
+            override fun uncaughtException(t: Thread?, e: Throwable?) {
+                val logger = XLog.tag("Crash").build()
+                logger.e("App crashed", e)
+                SystemClock.sleep(100)
+                if (currentHandler != null) currentHandler.uncaughtException(t, e)
+            }
+        })
+
+        val newLogger = object: LoggerInterface {
+            private var logger: com.elvishew.xlog.Logger =
+                    XLog.tag("XMPush").build()
+
+            @Override
+            override fun setTag(tag: String) {
+                logger = XLog.tag("XMPush-$tag").build()
+            }
+            @Override
+            override fun log(content: String, t: Throwable) {
+                logger.d(content, t)
+            }
+            @Override
+            override fun log(content: String) {
+                logger.d(content)
+            }
+        }
+        Logger.setLogger(this, newLogger)
+    }
+}

app/src/main/java/moe/yuuta/mipushtester/App.kt

@@ -0,0 +1,21 @@
+package moe.yuuta.mipushtester
+
+import android.os.Bundle
+
+import androidx.annotation.Nullable
+import androidx.appcompat.app.AppCompatActivity
+import androidx.navigation.Navigation
+import androidx.navigation.ui.NavigationUI
+
+class MainActivity : AppCompatActivity() {
+    @Override
+    override fun onCreate(@Nullable savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        NavigationUI.setupActionBarWithNavController(this, Navigation.findNavController(this, R.id.nav_host))
+    }
+
+    @Override
+    override fun onSupportNavigateUp(): Boolean =
+        Navigation.findNavController(this, R.id.nav_host).navigateUp()
+}