V4.0 wire

actor-sdk/sdk-api/api-language/languages/im.actor.apiLanguage/languageModels/editor.mps

@@ -1322,12 +1322,6 @@
   <node concept="24kQdi" id="4ASKzdDBzDk">
     <ref role="1XX52x" to="tsp6:4ASKzdDBfFg" resolve="Trait" />
     <node concept="3EZMnI" id="4ASKzdDBzDm" role="2wV5jI">
-      <node concept="3F0ifn" id="55bmeIQ7HZz" role="3EZMnx">
-        <property role="3F0ifm" value="" />
-        <node concept="ljvvj" id="55bmeIQ7HZI" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="3F0ifn" id="4ASKzdDBzLZ" role="3EZMnx">
         <property role="3F0ifm" value="trait" />
         <node concept="VechU" id="55bmeIQ9tMq" role="3F10Kt">
@@ -1389,6 +1383,9 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
+      <node concept="3F0ifn" id="47c0HGpSNh" role="3EZMnx">
+        <property role="3F0ifm" value="" />
+      </node>
       <node concept="l2Vlx" id="4ASKzdDBzDp" role="2iSdaV" />
     </node>
   </node>

actor-sdk/sdk-core-android/android-app/src/main/java/im/actor/Application.java

@@ -59,7 +59,7 @@ public void onConfigureActorSDK() {
 
         ActorStyle style = ActorSDK.sharedActor().style;
         style.setDialogsActiveTextColor(0xff5882ac);
-        style.setShowAvatarPrivateInTitle(false);
+        // style.setShowAvatarPrivateInTitle(false);
 
         ActorSDK.sharedActor().setFastShareEnabled(true);
 

actor-sdk/sdk-core-android/android-google-maps/build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'me.tatarka.retrolambda'
 group = 'im.actor'
 version = '0.0.1'
 
-def baseVersion = "3.0"
+def baseVersion = "4.0"
 
 android {
     compileSdkVersion 24

actor-sdk/sdk-core-android/android-google-push/build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'me.tatarka.retrolambda'
 group = 'im.actor'
 version = '0.0.1'
 
-def baseVersion = "3.0"
+def baseVersion = "4.0"
 
 android {
     compileSdkVersion 24

actor-sdk/sdk-core-android/android-sdk/build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'me.tatarka.retrolambda'
 group = 'im.actor'
 version = '0.0.1'
 
-def baseVersion = "3.0"
+def baseVersion = "4.0"
 
 android {
 

actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/ActorStyle.java

@@ -226,6 +226,25 @@ public void setVerifiedColor(int verifiedColor) {
         this.verifiedColor = verifiedColor;
     }
 
+    private int secretChatToolbar = 0xff4CAF50;
+    private int secretChatStatusbar = 0xff388E3C;
+
+    public int getSecretChatToolbar() {
+        return secretChatToolbar;
+    }
+
+    public void setSecretChatToolbar(int secretChatToolbar) {
+        this.secretChatToolbar = secretChatToolbar;
+    }
+
+    public int getSecretChatStatusbar() {
+        return secretChatStatusbar;
+    }
+
+    public void setSecretChatStatusbar(int secretChatStatusbar) {
+        this.secretChatStatusbar = secretChatStatusbar;
+    }
+
     //
     // List Styles
     //

actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/Intents.java

@@ -122,6 +122,10 @@ public static Intent openPrivateDialog(int uid, boolean compose, Context context
         return openDialog(Peer.user(uid), compose, context);
     }
 
+    public static Intent openPrivateSecretDialog(int uid, boolean compose, Context context) {
+        return openDialog(Peer.secret(uid), compose, context);
+    }
+
     public static Intent openGroupDialog(int chatId, boolean compose, Context context) {
         return openDialog(Peer.group(chatId), compose, context);
     }

actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/ChatActivity.java

@@ -14,12 +14,16 @@
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import im.actor.core.entity.Peer;
 import im.actor.sdk.ActorSDK;
+
+import im.actor.core.entity.Peer;
+import im.actor.core.entity.PeerType;
 import im.actor.sdk.R;
 import im.actor.sdk.controllers.activity.BaseActivity;
 import im.actor.sdk.util.Screen;
@@ -49,6 +53,13 @@ public void onCreate(Bundle saveInstance) {
 
         getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
+        // Secure Window from screenshoting
+        Peer peer = Peer.fromUniqueId(getIntent().getExtras().getLong(EXTRA_CHAT_PEER));
+        if (peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
+                    WindowManager.LayoutParams.FLAG_SECURE);
+        }
+
         //
         // Loading Layout
         //

actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/messages/MessagesDefaultFragment.java

@@ -15,6 +15,7 @@
 
 import im.actor.core.entity.Message;
 import im.actor.core.entity.Peer;
+import im.actor.core.entity.PeerType;
 import im.actor.core.entity.content.AbsContent;
 import im.actor.core.entity.content.TextContent;
 import im.actor.core.entity.content.UnsupportedContent;
@@ -120,10 +121,18 @@ public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
                         }
                     }
 
-                    menu.findItem(R.id.copy).setVisible(isAllText);
                     menu.findItem(R.id.quote).setVisible(isAllText);
-                    menu.findItem(R.id.forward).setVisible(selected.length == 1 || isAllText);
-                    menu.findItem(R.id.like).setVisible(selected.length == 1);
+
+                    if (peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED) {
+                        menu.findItem(R.id.copy).setVisible(false);
+                        menu.findItem(R.id.forward).setVisible(false);
+                        menu.findItem(R.id.like).setVisible(false);
+                    } else {
+                        menu.findItem(R.id.copy).setVisible(isAllText);
+                        menu.findItem(R.id.forward).setVisible(selected.length == 1 || isAllText);
+                        menu.findItem(R.id.like).setVisible(selected.length == 1);
+                    }
+
                     return false;
                 }
 

actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/messages/MessagesFragment.java

@@ -17,6 +17,7 @@
 import fr.castorflex.android.circularprogressbar.CircularProgressBar;
 import im.actor.core.entity.Message;
 import im.actor.core.entity.Peer;
+import im.actor.core.entity.PeerType;
 import im.actor.core.viewmodel.ConversationVM;
 import im.actor.runtime.Log;
 import im.actor.sdk.ActorSDK;
@@ -120,7 +121,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         } else {
             background = getResources().getDrawable(backgrounds[0]);
         }
-        ((ImageView) res.findViewById(R.id.chatBackgroundView)).setImageDrawable(background);
+        ImageView backgroundView = (ImageView) res.findViewById(R.id.chatBackgroundView);
+        backgroundView.setImageDrawable(background);
 
 
         //
@@ -283,13 +285,17 @@ public void onResume() {
         }
 
         // Bind Progress
-        bind(conversationVM.getIsLoaded(), conversationVM.getIsEmpty(), (isLoaded, valueModel, isEmpty, valueModel2) -> {
-            if (isEmpty && !isLoaded) {
-                showView(progressView);
-            } else {
-                hideView(progressView);
-            }
-        });
+        if (peer.getPeerType() != PeerType.PRIVATE_ENCRYPTED) {
+            bind(conversationVM.getIsLoaded(), conversationVM.getIsEmpty(), (isLoaded, valueModel, isEmpty, valueModel2) -> {
+                if (isEmpty && !isLoaded) {
+                    showView(progressView);
+                } else {
+                    hideView(progressView);
+                }
+            });
+        } else {
+            hideView(progressView);
+        }
     }
 
     @Override

actor-sdk/sdk-core-android/android-sdk/src/main/java/im/actor/sdk/controllers/conversation/toolbar/ChatToolbarFragment.java

@@ -3,9 +3,12 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -101,6 +104,16 @@ public void onConfigureActionBar(ActionBar actionBar) {
         actionBar.setDisplayShowHomeEnabled(false);
         actionBar.setDisplayShowCustomEnabled(true);
 
+        // Coloring Toolbar
+        if (peer.getPeerType() != PeerType.PRIVATE_ENCRYPTED) {
+            actionBar.setBackgroundDrawable(new ColorDrawable(style.getToolBarColor()));
+        } else {
+            actionBar.setBackgroundDrawable(new ColorDrawable(style.getSecretChatToolbar()));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                getActivity().getWindow().setStatusBarColor(style.getSecretChatStatusbar());
+            }
+        }
+
         // Loading Toolbar header views
         ActorStyle style = ActorSDK.sharedActor().style;
         barView = LayoutInflater.from(getActivity()).inflate(R.layout.bar_conversation, null);
@@ -132,7 +145,7 @@ public void onConfigureActionBar(ActionBar actionBar) {
         barAvatar.init(Screen.dp(32), 18);
 
         barView.findViewById(R.id.titleContainer).setOnClickListener(v -> {
-            if (peer.getPeerType() == PeerType.PRIVATE) {
+            if (peer.getPeerType() == PeerType.PRIVATE || peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED) {
                 ActorSDKLauncher.startProfileActivity(getActivity(), peer.getPeerId());
             } else if (peer.getPeerType() == PeerType.GROUP) {
                 ActorSDK.sharedActor().startGroupInfoActivity(getActivity(), peer.getPeerId());
@@ -148,7 +161,7 @@ public void onResume() {
 
         // Performing all required Data Binding here
 
-        if (peer.getPeerType() == PeerType.PRIVATE) {
+        if (peer.getPeerType() == PeerType.PRIVATE || peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED) {
 
             // Loading user
             UserVM user = users().get(peer.getPeerId());
@@ -171,7 +184,11 @@ public void onResume() {
             bind(barSubtitle, user);
 
             // Binding User typing to Toolbar
-            bindPrivateTyping(barTyping, barTypingContainer, barSubtitle, messenger().getTyping(user.getId()));
+            if (peer.getPeerType() != PeerType.PRIVATE_ENCRYPTED) {
+                bindPrivateTyping(barTyping, barTypingContainer, barSubtitle, messenger().getTyping(user.getId()));
+            } else {
+                bindPrivateTyping(barTyping, barTypingContainer, barSubtitle, messenger().getSecretTyping(user.getId()));
+            }
 
             // Refresh menu on contact state change
             bind(user.isContact(), (val, valueModel) -> {
@@ -206,7 +223,14 @@ public void onResume() {
                 bindGroupTyping(barTyping, barTypingContainer, barSubtitle, messenger().getGroupTyping(group.getId()));
             }
         }
-
+
+        // Show/Hide Avatar
+        if (!style.isShowAvatarInTitle() ||
+                ((peer.getPeerType() == PeerType.PRIVATE || peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED)
+                        && !style.isShowAvatarPrivateInTitle())) {
+            barAvatar.setVisibility(View.GONE);
+        }
+
         // Global Counter
         bind(messenger().getGlobalState().getGlobalCounter(), (val, valueModel) -> {
             if (val != null && val > 0) {
@@ -224,33 +248,11 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 
         // Inflating menu
         inflater.inflate(R.menu.chat_menu, menu);
-
-        // Show menu for opening chat contact
-//        if (peer.getPeerType() == PeerType.PRIVATE) {
-//            menu.findItem(R.id.contact).setVisible(true);
-//        } else {
-//            menu.findItem(R.id.contact).setVisible(false);
-//        }
-
-        // Show menus for leave group and group info view
-//        if (peer.getPeerType() == PeerType.GROUP) {
-//            GroupVM groupVM = groups().get(peer.getPeerId());
-//            if (groupVM.isMember().get()) {
-//                menu.findItem(R.id.leaveGroup).setVisible(true);
-//                menu.findItem(R.id.groupInfo).setVisible(true);
-//            } else {
-//                menu.findItem(R.id.leaveGroup).setVisible(false);
-//                menu.findItem(R.id.groupInfo).setVisible(false);
-//            }
-//            if (groupVM.getGroupType() == GroupType.GROUP) {
-//                menu.findItem(R.id.clear).setVisible(true);
-//            } else {
-//                menu.findItem(R.id.clear).setVisible(false);
-//            }
-//        } else {
-//            menu.findItem(R.id.groupInfo).setVisible(false);
-//            menu.findItem(R.id.leaveGroup).setVisible(false);
-//        }
+        MenuItem addToContacts = menu.findItem(R.id.add_to_contacts);
+        MenuItem callMenu = menu.findItem(R.id.call);
+        MenuItem videoMenu = menu.findItem(R.id.video_call);
+        MenuItem keyMenu = menu.findItem(R.id.key);
+        MenuItem timerMenu = menu.findItem(R.id.timer);
 
         // Voice and Video calls
         boolean callsEnabled = ActorSDK.sharedActor().isCallsEnabled();
@@ -259,7 +261,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             if (peer.getPeerType() == PeerType.PRIVATE) {
                 callsEnabled = !users().get(peer.getPeerId()).isBot();
             } else if (peer.getPeerType() == PeerType.GROUP) {
-
                 GroupVM groupVM = groups().get(peer.getPeerId());
                 if (groupVM.getGroupType() == GroupType.GROUP && groupVM.isMember().get() && groupVM.getIsCanCall().get()) {
                     callsEnabled = groupVM.getMembersCount().get() <= MAX_USERS_FOR_CALLS;
@@ -268,14 +269,21 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
                     callsEnabled = false;
                     videoCallsEnabled = false;
                 }
+            } else {
+                callsEnabled = false;
+                videoCallsEnabled = false;
             }
         }
-        menu.findItem(R.id.call).setVisible(callsEnabled);
-        menu.findItem(R.id.video_call).setVisible(callsEnabled && videoCallsEnabled);
+        callMenu.setVisible(callsEnabled);
+        videoMenu.setVisible(callsEnabled && videoCallsEnabled);
+
+        // Secret Chat
+        keyMenu.setVisible(peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED);
+        timerMenu.setVisible(peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED);
 
         // Add to contacts
         if (peer.getPeerType() == PeerType.PRIVATE) {
-            menu.findItem(R.id.add_to_contacts).setVisible(!users().get(peer.getPeerId()).isContact().get());
+            addToContacts.setVisible(!users().get(peer.getPeerId()).isContact().get());
         }
     }
 
@@ -352,6 +360,21 @@ public void onError(final Exception e) {
                 return true;
             }
         }
+
+        if (item.getItemId() == R.id.timer) {
+            int[] timers = new int[]{
+                    0, 1000, 2000, 5000, 15000, 60000, 60 * 60000, 24 * 60 * 60000
+            };
+            new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.timer_title)
+                    .setItems(R.array.timer_values, (dialogInterface, i1) -> {
+                        execute(messenger().setSecretChatTimer(peer.getPeerId(), timers[i1]));
+                    })
+                    .show()
+                    .setCanceledOnTouchOutside(true);
+
+        }
+
         return super.onOptionsItemSelected(item);
     }
 
@@ -367,7 +390,7 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
 
     private void startCall(boolean video) {
         Command<Long> cmd;
-        if (peer.getPeerType() == PeerType.PRIVATE) {
+        if (peer.getPeerType() == PeerType.PRIVATE || peer.getPeerType() == PeerType.PRIVATE_ENCRYPTED) {
             cmd = video ? messenger().doVideoCall(peer.getPeerId()) : messenger().doCall(peer.getPeerId());
         } else {
             cmd = messenger().doGroupCall(peer.getPeerId());