eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 13:45:42 +00:00
Code Activity

Fix fragment initialization to solve issue with unhandled QR code on some devices

Browse Source
This commit is contained in:
Robert Benedikt
2019-01-15 11:44:03 +01:00
parent 2df07cc9ad
commit 844fd4f86b
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.buoy.positioning.app/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
+10 -8
View File
@@ -1,12 +1,5 @@
package com.sap.sailing.android.buoy.positioning.app.ui.activities;
import com.sap.sailing.android.buoy.positioning.app.R;
import com.sap.sailing.android.buoy.positioning.app.ui.fragments.HomeFragment;
import com.sap.sailing.android.buoy.positioning.app.util.AboutHelper;
import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
import com.sap.sailing.android.shared.ui.activities.AbstractStartActivity;
import com.sap.sailing.android.shared.ui.fragments.AbstractHomeFragment;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
@@ -15,6 +8,13 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.sap.sailing.android.buoy.positioning.app.R;
import com.sap.sailing.android.buoy.positioning.app.ui.fragments.HomeFragment;
import com.sap.sailing.android.buoy.positioning.app.util.AboutHelper;
import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
import com.sap.sailing.android.shared.ui.activities.AbstractStartActivity;
import com.sap.sailing.android.shared.ui.fragments.AbstractHomeFragment;
public class StartActivity extends AbstractStartActivity<CheckinData> {
@Override
@@ -29,7 +29,9 @@ public class StartActivity extends AbstractStartActivity<CheckinData> {
int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
toolbar.setPadding(sidePadding, 0, 0, 0);
}
replaceFragment(R.id.content_frame, new HomeFragment());
if (savedInstanceState == null) {
replaceFragment(R.id.content_frame, new HomeFragment());
}
}
@Override
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
+12 -10
View File
@@ -1,6 +1,13 @@
package com.sap.sailing.android.tracking.app.ui.activities;
import java.util.List;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.sap.sailing.android.shared.data.BaseCheckinData;
import com.sap.sailing.android.shared.logging.ExLog;
@@ -18,14 +25,7 @@ import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
import com.sap.sailing.android.tracking.app.valueobjects.MarkCheckinData;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import java.util.List;
public class StartActivity extends AbstractStartActivity<CheckinData> {
@@ -45,7 +45,9 @@ public class StartActivity extends AbstractStartActivity<CheckinData> {
int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
toolbar.setPadding(sidePadding, 0, 0, 0);
}
replaceFragment(R.id.content_frame, new HomeFragment());
if (savedInstanceState == null) {
replaceFragment(R.id.content_frame, new HomeFragment());
}
refreshDatabase();
Bitmap largeIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);