commit | b0b97eec126350ec3b2ac4e2073d4c01d508e08a | [log] [tgz] |
---|---|---|
author | Ken Ashcraft <kash@google.com> | Mon Oct 26 23:58:29 2015 -0700 |
committer | Ken Ashcraft <kash@google.com> | Mon Oct 26 23:58:29 2015 -0700 |
tree | 506ad91f3e06f29adfc88ef401808556f473bb6f | |
parent | 2aa54739738804b691acf02eec7795df10f75b67 [diff] |
TBR: syncslides: Last minute fixes. Don't populate syncbase with a dummy deck. Handle a NPE in saveNotes. Change-Id: I23c3d5cc37f3c337b039e1b14f5e4cb98537f512
diff --git a/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/NavigateFragment.java b/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/NavigateFragment.java index 073363b..51a051c 100644 --- a/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/NavigateFragment.java +++ b/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/NavigateFragment.java
@@ -344,9 +344,11 @@ InputMethodManager inputManager = (InputMethodManager) getContext(). getSystemService(Context.INPUT_METHOD_SERVICE); - inputManager.hideSoftInputFromWindow( - getActivity().getCurrentFocus().getWindowToken(), - InputMethodManager.HIDE_NOT_ALWAYS); + if (getActivity().getCurrentFocus() != null) { + inputManager.hideSoftInputFromWindow( + getActivity().getCurrentFocus().getWindowToken(), + InputMethodManager.HIDE_NOT_ALWAYS); + } ((PresentationActivity) getActivity()).setUiImmersive(true); }
diff --git a/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/db/SyncbaseDB.java b/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/db/SyncbaseDB.java index 0d88187..d6aa758 100644 --- a/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/db/SyncbaseDB.java +++ b/projects/syncslides/app/src/main/java/io/v/android/apps/syncslides/db/SyncbaseDB.java
@@ -189,7 +189,7 @@ if (!mPresentations.exists(mVContext)) { mPresentations.create(mVContext, mPermissions); } - importDecks(); + //importDecks(); } catch (VException e) { handleError("Couldn't setup syncbase service: " + e.getMessage()); return;