actorapp · dfsilva · Aug 19, 2016 · Aug 22, 2016 · Aug 22, 2016 · Aug 24, 2016
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -144,3 +144,4 @@ node_modules
 actor-sdk/sdk-api/api-language/solutions/im.actor.api/source_gen
 actor-sdk/sdk-api/api-language/solutions/im.actor.api/source_gen.caches
 actor-sdk/sdk-api/api-language/solutions/im.actor.api/classes_gen
+.DS_Store
diff --git a/actor-sdk/.DS_Store b/actor-sdk/.DS_Store
diff --git a/actor-sdk/sdk-api/actor-extension.json b/actor-sdk/sdk-api/actor-extension.json
@@ -1,7 +1,9 @@
 {
   "version": "0.1",
-  "scala-package": "im.actor.extension.api",
-  "java-package": "im.actor.extension.api",
-  "aliases": [],
-  "sections": []
-}
+  "scala-package": "im.actor.api.xloto.rpc",
+  "java-package": "im.actor.core.xloto.api",
+  "aliases": [
+
+  ],
+  "sections": [
+]}
diff --git a/actor-sdk/sdk-api/actor.json b/actor-sdk/sdk-api/actor.json
diff --git a/actor-sdk/sdk-api/api-language/.mps/misc.xml b/actor-sdk/sdk-api/api-language/.mps/misc.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" />
-</project>
-
+</project>
diff --git a/actor-sdk/sdk-api/api-language/solutions/im.actor.api/models/im/actor/api/scheme.mps b/actor-sdk/sdk-api/api-language/solutions/im.actor.api/models/im/actor/api/scheme.mps
@@ -8977,6 +8977,29 @@
           <ref role="NX6Kv" node="3iWZ2kgyrUz" resolve="groupPeer" />
         </node>
       </node>
+      <node concept="2m6fVq" id="5uZ_hMrfjip" role="2m5mJr">
+        <property role="TrG5h" value="JoinGroupByGroupId" />
+        <node concept="2m7Kf5" id="5uZ_hMrfjxR" role="2m0hLx">
+          <property role="2m7DUN" value="1" />
+          <property role="TrG5h" value="groupId" />
+          <node concept="wb0Ql" id="5WsZrvigLlo" role="2m7DVh">
+            <ref role="wb18D" node="5qm50Y0e3uO" resolve="groupId" />
+          </node>
+        </node>
+        <node concept="Nu42z" id="5uZ_hMrfjiq" role="NuuwV">
+          <property role="Nu42W" value="AE11" />
+        </node>
+        <node concept="2m1Rp1" id="5uZ_hMrfjxY" role="2m6efq">
+          <ref role="2m1o9l" node="GBscvBB6_W" resolve="Seq" />
+        </node>
+        <node concept="NXeRC" id="5uZ_hMrfk4v" role="1GBnQ6">
+          <property role="NXePf" value="Join group by peer without a necessity of invite" />
+        </node>
+        <node concept="NX1gA" id="5uZ_hMrfkzU" role="1GBnQ6">
+          <property role="NX6R2" value="Groups peer" />
+          <ref role="NX6Kv" node="5uZ_hMrfjxR" resolve="groupId" />
+        </node>
+      </node>
       <node concept="NvWBy" id="3c_gimmPEMd" role="2m5mJr">
         <property role="NvWrd" value="Administration" />
       </node>
@@ -18504,17 +18527,6 @@
     <property role="u_6dX" value="0.1" />
     <property role="3BlOl8" value="im.actor.extension.api" />
     <property role="WhUdw" value="im.actor.extension.api" />
-    <node concept="2m5mJO" id="64HNz1Ipac2" role="2m5lHt">
-      <node concept="2m5naR" id="64HNz1Ipac6" role="2m5mJr">
-        <property role="TrG5h" value="test" />
-        <node concept="2m7Kf5" id="64HNz1Ipac9" role="2m0hLx">
-          <property role="2m7DUN" value="1" />
-          <node concept="2m5mGg" id="64HNz1Ipacd" role="2m7DVh">
-            <ref role="2m5mJy" node="GBscvBB6fx" resolve="Peer" />
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
 </model>
 
diff --git a/actor-sdk/sdk-core-android/.DS_Store b/actor-sdk/sdk-core-android/.DS_Store
diff --git a/actor-sdk/sdk-core-android/android-app/build.gradle b/actor-sdk/sdk-core-android/android-app/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
         classpath "com.google.gms:google-services:3.0.0"
     }
@@ -9,6 +9,7 @@ buildscript {
 apply plugin: 'com.android.application'
 apply plugin: 'me.tatarka.retrolambda'
 
+
 android {
     compileSdkVersion 24
     buildToolsVersion "24.0.0"

diff --git a/actor-sdk/sdk-core-android/android-app/src/main/java/im/actor/Application.java b/actor-sdk/sdk-core-android/android-app/src/main/java/im/actor/Application.java
@@ -29,6 +29,7 @@
 import im.actor.sdk.ActorSDKApplication;
 import im.actor.sdk.ActorStyle;
 import im.actor.sdk.BaseActorSDKDelegate;
+import im.actor.sdk.controllers.auth.AuthActivity;
 import im.actor.sdk.controllers.conversation.attach.AbsAttachFragment;
 import im.actor.sdk.controllers.conversation.messages.BubbleLayouter;
 import im.actor.sdk.controllers.conversation.messages.DefaultLayouter;
@@ -55,26 +56,42 @@ public void onCreate() {
     @Override
     public void onConfigureActorSDK() {
         ActorSDK.sharedActor().setDelegate(new ActorSDKDelegate());
-        ActorSDK.sharedActor().setPushId(209133700967L);
+        ActorSDK.sharedActor().setPushId(43880936595L);
+        ActorSDK.sharedActor().setActorPushEndpoint(null);
         ActorSDK.sharedActor().setOnClientPrivacyEnabled(true);
-
         ActorStyle style = ActorSDK.sharedActor().style;
         style.setDialogsActiveTextColor(0xff5882ac);
         style.setShowAvatarPrivateInTitle(false);
 
+        style.setDialogsActiveTextColor(0xff5882ac);
+        style.setMainColor(Color.parseColor("#A43436"));
+        style.setAccentColor(Color.parseColor("#1F3255"));
+        style.setStatusBarColor(Color.parseColor("#A43436"));
+        style.setAccentPressedColor(Color.parseColor("#1F3255"));
+        style.setPrimaryAltColor(Color.parseColor("#A43436"));
+        style.setToolBarColor(Color.parseColor("#A43436"));
+        style.setFabColor(Color.parseColor("#A43436"));
+
         ActorSDK.sharedActor().setFastShareEnabled(true);
 
         ActorSDK.sharedActor().setCallsEnabled(true);
 
+        ActorSDK.sharedActor().setAppName("XLoto Mensageiro");
+
         ActorSDK.sharedActor().setTosUrl("http://actor.im");
         ActorSDK.sharedActor().setPrivacyText("bla bla bla");
 
-        ActorSDK.sharedActor().setVideoCallsEnabled(true);
+        ActorSDK.sharedActor().setVideoCallsEnabled(false);
 
         ActorSDK.sharedActor().setAutoJoinGroups(new String[]{
-                "actor_news"
+                "canalxloto"
         });
 
+//        ActorSDK.sharedActor().setEndpoints(new String[]{"tcp://192.168.1.3:9070"});
+        ActorSDK.sharedActor().setEndpoints(new String[]{"tcp://api-mtproto.im.xloto.com.br:9070"});
+        ActorSDK.sharedActor().setAuthType(AuthActivity.AUTH_TYPE_PHONE);
+
+        ActorSDK.sharedActor().setStickersEnabled(false);
 
 //        ActorSDK.sharedActor().setTwitter("");
 //        ActorSDK.sharedActor().setHomePage("http://www.foo.com");
@@ -162,46 +179,58 @@ public AbsAttachFragment fragmentForAttachMenu(Peer peer) {
 
         @Override
         public ActorIntentFragmentActivity getSettingsIntent() {
-            return new BaseActorSettingsActivity() {
+
+            return new BaseActorSettingsActivity(){
                 @Override
                 public BaseActorSettingsFragment getSettingsFragment() {
-                    return new BaseActorSettingsFragment() {
-                        CheckBox blablaCheckBox;
-
-                        @Override
-                        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-                            blablaCheckBox = new CheckBox(getContext());
-                            return super.onCreateView(inflater, container, savedInstanceState);
-                        }
-
-                        @Override
-                        public ActorSettingsCategories getBeforeSettingsCategories() {
-                            return new ActorSettingsCategories()
-                                    .addCategory(new ActorSettingsCategory("azaza")
-                                            .addField(new ActorSettingsField(R.id.terminateSessions)
-                                                    .setName("blabla")
-                                                    .setIconResourceId(R.drawable.ic_edit_black_24dp)
-                                                    .setRightView(blablaCheckBox)
-                                            )
-                                    );
-                        }
-
-                        @Override
-                        public View.OnClickListener getMenuFieldOnClickListener() {
-                            return new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    switch (v.getId()) {
-                                        case R.id.terminateSessions:
-                                            Toast.makeText(v.getContext(), "hey", Toast.LENGTH_LONG).show();
-                                            blablaCheckBox.toggle();
-                                            break;
-                                    }
-                                }
-                            };
-                        }
-
-                    };
+                    return new MyBaseActorSettingsFragment();
+                }
+            };
+        }
+    }
+
+
+    public static class MyBaseActorSettingsActivity extends BaseActorSettingsActivity {
+
+        @Override
+        public BaseActorSettingsFragment getSettingsFragment() {
+            return new MyBaseActorSettingsFragment();
+        }
+    }
+
+
+    public static class MyBaseActorSettingsFragment extends BaseActorSettingsFragment {
+        CheckBox blablaCheckBox;
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+            blablaCheckBox = new CheckBox(getContext());
+            return super.onCreateView(inflater, container, savedInstanceState);
+        }
+
+        @Override
+        public ActorSettingsCategories getBeforeSettingsCategories() {
+            return new ActorSettingsCategories()
+                    .addCategory(new ActorSettingsCategory("azaza")
+                            .addField(new ActorSettingsField(R.id.terminateSessions)
+                                    .setName("blabla")
+                                    .setIconResourceId(R.drawable.ic_edit_black_24dp)
+                                    .setRightView(blablaCheckBox)
+                            )
+                    );
+        }
+
+        @Override
+        public View.OnClickListener getMenuFieldOnClickListener() {
+            return new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    switch (v.getId()) {
+                        case R.id.terminateSessions:
+                            Toast.makeText(v.getContext(), "hey", Toast.LENGTH_LONG).show();
+                            blablaCheckBox.toggle();
+                            break;
+                    }
                 }
             };
         }

diff --git a/actor-sdk/sdk-core-android/android-google-maps/build.gradle b/actor-sdk/sdk-core-android/android-google-maps/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
@@ -23,7 +23,7 @@ def baseVersion = "3.0"
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         minSdkVersion 15
@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 
     //compile 'im.actor:android-sdk:0.1.30'
     compile project(':actor-sdk:sdk-core-android:android-sdk')
@@ -132,19 +132,23 @@ project.afterEvaluate {
 
     if (isDeployConfigured) {
 
-        signing {
-            sign configurations.archives
-        }
+//        signing {
+//            sign configurations.archives
+//        }
 
         uploadArchives {
             repositories {
                 mavenDeployer {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+//                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                    repository(url: "http://104.233.107.117:8081/nexus/content/repositories/snapshots/") {
                         authentication(userName: ossrhUsername, password: ossrhPassword)
                     }
 
+//                    repository(url: "http://localhost:8081/nexus/content/repositories/snapshots/") {
+//                        authentication(userName: ossrhUsername, password: ossrhPassword)
+//                    }
+
                     pom.project {
                         name 'Actor SDK for Android Google Extension'
                         packaging 'aar'

diff --git a/...dk/sdk-core-android/android-google-maps/src/main/java/im/actor/map/MapPickerActivity.java b/...dk/sdk-core-android/android-google-maps/src/main/java/im/actor/map/MapPickerActivity.java
@@ -35,6 +35,7 @@
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapFragment;
+import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
@@ -290,6 +291,7 @@ private void setUpMapIfNeeded() {
         // Do a null check to confirm that we have not already instantiated the map.
         if (mMap == null) {
             // Try to obtain the map from the SupportMapFragment.
+
             ((MapFragment) getFragmentManager().findFragmentById(R.id.map))
                     .getMapAsync(googleMap -> {
                         mMap = googleMap;

diff --git a/actor-sdk/sdk-core-android/android-google-push/build.gradle b/actor-sdk/sdk-core-android/android-google-push/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
@@ -21,7 +21,7 @@ def baseVersion = "3.0"
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         minSdkVersion 15
@@ -46,7 +46,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 
     //compile 'im.actor:android-sdk:0.1.30'
     compile project(':actor-sdk:sdk-core-android:android-sdk')
@@ -129,19 +129,23 @@ project.afterEvaluate {
 
     if (isDeployConfigured) {
 
-        signing {
-            sign configurations.archives
-        }
+//        signing {
+//            sign configurations.archives
+//        }
 
         uploadArchives {
             repositories {
                 mavenDeployer {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+//                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                    repository(url: "http://104.233.107.117:8081/nexus/content/repositories/snapshots/") {
                         authentication(userName: ossrhUsername, password: ossrhPassword)
                     }
 
+//                    repository(url: "http://localhost:8081/nexus/content/repositories/snapshots/") {
+//                        authentication(userName: ossrhUsername, password: ossrhPassword)
+//                    }
+
                     pom.project {
                         name 'Actor SDK for Android Google Extension'
                         packaging 'aar'

diff --git a/actor-sdk/sdk-core-android/android-sdk/.DS_Store b/actor-sdk/sdk-core-android/android-sdk/.DS_Store