Deactivated dummy and multiple other fixes.

SharedKnowledge · Jun 7, 2017 · 70cdeef · 70cdeef
1 parent 271c668
commit 70cdeef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/net/sharksystem/sharknet/chat/ChatDetailActivity.java b/app/src/main/java/net/sharksystem/sharknet/chat/ChatDetailActivity.java
@@ -152,8 +152,10 @@ public void onNewMerge(SyncComponent component, SharkKB changes) {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    mAdapter.setMessages(mChat.getMessages());
-                    mRecyclerView.scrollToPosition(mAdapter.getItemCount() - 1);
+                    if(mChat!=null){
+                        mAdapter.setMessages(mChat.getMessages());
+                        mRecyclerView.scrollToPosition(mAdapter.getItemCount() - 1);
+                    }
                 }
             });
         }

diff --git a/app/src/main/java/net/sharksystem/sharknet/main/MainActivity.java b/app/src/main/java/net/sharksystem/sharknet/main/MainActivity.java
@@ -60,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {
     public void onServiceConnected(ComponentName name, IBinder service) {
         super.onServiceConnected(name, service);
         // Switch dummy content
-        getSharkApp().activateDummy();
+//        getSharkApp().activateDummy();
 
         if(!wifiEnabled() || !bluetoothEnabled()){
             AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);

diff --git a/app/src/main/java/net/sharksystem/sharknet/main/NewProfileFragment.java b/app/src/main/java/net/sharksystem/sharknet/main/NewProfileFragment.java
@@ -85,7 +85,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         L.d("onActivityResult called", this);
 
-        if (requestCode == 1 && data != null && data.getData() != null) {
+        if (requestCode == PICK_IMAGE_REQUEST && data != null && data.getData() != null) {
             Uri uri = data.getData();
             try {
                 Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);