Merge remote-tracking branch 'origin/testSuite' into testSuite

aau-network-security · Jul 1, 2020 · 268984b · 268984b
2 parents 19f3db9 + a789c97
commit 268984b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/google-services.json b/google-services.json
@@ -14,6 +14,14 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "283609891050-jdphgin4k1cl79jdc1fjs9qkak9bmquj.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "de.tudarmstadt.informatik.hostage",
+            "certificate_hash": "3611fd3f232bc7a9f8afbd41824c9d1ae2efc9f8"
+          }
+        },
         {
           "client_id": "283609891050-36dl28rq07gt758o64dotvfceotf9deg.apps.googleusercontent.com",
           "client_type": 3

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
         android:icon="@drawable/ic_launcher"
         android:installLocation="preferExternal"
         android:label="@string/app_name"
-        android:theme="@style/Theme.App"
+        android:theme="@style/Theme.AppCompat"
         android:vmSafeMode="true"
         android:largeHeap="true">