dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "DynamicLinking V1"

Browse Source 
This reverts commit 63889c03a2.
This commit is contained in:
Georg Reisinger
2019-03-25 09:25:21 +01:00
parent 63889c03a2
commit 19cc79d5b3
5 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/AndroidManifest.xml
View File

@ -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>

37
app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java
View File

@ -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);