diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 01ca2e4..b0c9e5a 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 13e94c4..5c47f61 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,5 +42,4 @@ dependencies {
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'cz.msebera.android:httpclient:4.4.1.2'
-    implementation 'com.google.firebase:firebase-dynamic-links:16.1.7'
 }
diff --git a/app/google-services.json b/app/google-services.json
index bb097df..84326e6 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -6,6 +6,37 @@
     "storage_bucket": "test-667ca.appspot.com"
   },
   "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:221332577314:android:acb28f092122eb64",
+        "android_client_info": {
+          "package_name": "at.smartshopper.smartshopper"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "221332577314-oo8b4uqtlgj75e7u7o3qt1vc96prfv52.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDz7MzopErZ6paAIaGGJAGY8Lx9kly5q2k"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:221332577314:android:33ebe9c1c19a0a72",
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ec3b8d..1f0d386 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:usesCleartextTraffic="true">
         <activity
             android:name="at.smartshopper.smartshopperapp.activitys.EditUser"
-            android:label="@string/title_activity_edit_user"/>
+            android:label="@string/title_activity_edit_user"></activity>
         <activity android:name="at.smartshopper.smartshopperapp.activitys.DoneItemActivity" />
         <activity
             android:name="at.smartshopper.smartshopperapp.activitys.ItemListActivity"
@@ -26,14 +26,6 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data
-                    android:host="smartshopper.cf"
-                    android:scheme="https"/>
-            </intent-filter>
         </activity>
         <activity
             android:name="at.smartshopper.smartshopperapp.activitys.Dash"
@@ -63,7 +55,6 @@
         <activity
             android:name="at.smartshopper.smartshopperapp.activitys.ShoppinglistDetails"
             android:label="@string/title_activity_shoppinglist_details" />
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java
index 70feb81..baa65c1 100644
--- a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java
+++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java
@@ -1,7 +1,6 @@
 package at.smartshopper.smartshopperapp.activitys;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
@@ -20,16 +19,12 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.common.SignInButton;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
-import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
-import com.google.firebase.dynamiclinks.PendingDynamicLinkData;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 
@@ -52,36 +47,6 @@ public class LoginActivity extends AppCompatActivity {
     //Für Double Back press to exit
     private boolean doubleBackToExitPressedOnce = false;
 
-    public void getDynamicLink(){
-        FirebaseDynamicLinks.getInstance()
-                .getDynamicLink(getIntent())
-                .addOnSuccessListener(this, new OnSuccessListener<PendingDynamicLinkData>() {
-                    @Override
-                    public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
-                        // Get deep link from result (may be null if no link is found)
-                        Uri deepLink = null;
-                        if (pendingDynamicLinkData != null) {
-                            deepLink = pendingDynamicLinkData.getLink();
-                            Log.d("SmartShopper", deepLink.toString());
-                        }
-
-
-                        // Handle the deep link. For example, open the linked
-                        // content, or apply promotional credit to the user's
-                        // account.
-                        // ...
-
-                        // ...
-                    }
-                })
-                .addOnFailureListener(this, new OnFailureListener() {
-                    @Override
-                    public void onFailure(@NonNull Exception e) {
-                        Log.w(TAG, "getDynamicLink:onFailure", e);
-                    }
-
-                });
-    }
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -225,8 +190,6 @@ public class LoginActivity extends AppCompatActivity {
         mAuth = FirebaseAuth.getInstance();
         db = new Database();
 
-        getDynamicLink();
-
         Button loginEmailBtn = (Button) findViewById(R.id.loginEmailBtn);
         final TextView email = (TextView) findViewById(R.id.email);
         final TextView passwort = (TextView) findViewById(R.id.password);