X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2FCampusApp.java;h=9c3542be9204ea974c032aec2a093f9660568f21;hb=75c044dea598b6572660118e3e46026d4c5df06c;hp=403c7401b748e12feeb2d2ca8f935f60b7eb6596;hpb=12137edd8e00a50e1cb621193594f80e8a3591fc;p=DHBWCampusApp.git diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java b/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java index 403c740..9c3542b 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java +++ b/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java @@ -17,11 +17,8 @@ package de.dhbwloe.campusapp; import android.content.Context; import android.content.Intent; -import android.content.res.TypedArray; import android.nfc.NfcAdapter; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; import android.support.v4.app.FragmentActivity; import android.util.Log; import android.view.KeyEvent; @@ -30,7 +27,6 @@ import android.support.design.widget.NavigationView; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; @@ -43,8 +39,6 @@ import android.widget.TextView; import java.util.Date; -import de.dhbwloe.campusapp.nfcreader.NfcCardListener; - public class CampusApp extends FragmentActivity { private boolean bSearchActive = false; private CampusAppContext AppContext = null; @@ -69,7 +63,7 @@ public class CampusApp extends FragmentActivity { if(CampusAppContext.DEBUG) { final Thread.UncaughtExceptionHandler systemExceptionHandler = Thread.getDefaultUncaughtExceptionHandler(); - final CampusAppExceptionHandler oExceptionHandler = new CampusAppExceptionHandler(); + final CampusAppCrashHandler oExceptionHandler = new CampusAppCrashHandler(); Thread.setDefaultUncaughtExceptionHandler (new Thread.UncaughtExceptionHandler() { @Override public void uncaughtException(Thread thread, Throwable e) { @@ -308,7 +302,7 @@ public class CampusApp extends FragmentActivity { AppContext = new CampusAppContext(this, R.id.fragment_container, R.id.nav_view); else AppContext.setMainActivity(this); - + super.onResume(); Log.i("CampusApp", "onResume event"); AppContext.getNfcCardListener().resumeForefrontDispatcher();