DrKLO · chbaluch · May 11, 2014 · May 11, 2014 · May 12, 2014 · May 12, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,19 @@
-.idea/
-.gradle/
-build/
-obj/
-*.iml
-local.properties
-*.keystore
-gradle.properties
-
-TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
+.idea/
+.gradle/
+Aniways/
+build/
+obj/
+*.iml
+local.properties
+*.keystore
+*.trace
+gradle.properties
+
+TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
+aniways/
+TMessagesProj/TMessagesProj-release.apk
+TMessagesProj/manifest-merger-release-report.txt
+
+TMessagesProj/mapping.txt
+TMessagesProj/seeds.txt
+TMessagesProj/unused.txt
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -1,20 +1,87 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven { url "https://raw.github.com/Raizlabs/maven-releases/master/releases" }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.3'
+    }
+}
+
+configurations {
+    all*.exclude group: 'com.android.support', module: 'support-v4'
+    all*.exclude group: 'com.android.support', module: 'appcompat-v7'
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        maven {
+            url 'https://dl.bintray.com/intercom/intercom-maven'
+        }
+        maven { url "https://raw.github.com/Raizlabs/maven-releases/master/releases" }
+    }
+}
+
 apply plugin: 'com.android.application'
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:22.2.+'
-    compile 'com.google.android.gms:play-services:3.2.+'
+    compile 'com.google.android.gms:play-services-maps:7.5.0'
+    compile 'com.google.android.gms:play-services-location:7.5.0'
+    compile 'com.google.android.gms:play-services-identity:7.5.0'
+    compile 'com.google.android.gms:play-services-appstate:7.5.0'
+    compile 'com.google.android.gms:play-services-wearable:7.5.0'
+    compile 'com.google.android.gms:play-services-gcm:7.5.0'
     compile 'net.hockeyapp.android:HockeySDK:3.5.+'
     compile 'com.googlecode.mp4parser:isoparser:1.0.+'
+    compile project(':Android-SDK')
+    compile ('io.intercom.android:intercom-sdk:1.0.4@aar') {
+        transitive = true
+    }
+    //debugCompile 'com.facebook.stetho:stetho:1.0.0'
 }
 
 android {
     compileSdkVersion 22
     buildToolsVersion '22.0.1'
 
+    flavorDimensions "abi"
+
+    productFlavors {
+        fat {
+            flavorDimension "abi"
+            ndk {
+                abiFilters "x86", "armeabi-v7a", "armeabi"
+                versionCode = 265;
+            }
+        }
+//        arm {
+//            flavorDimension "abi"
+//            ndk {
+//                abiFilter "armeabi"
+//                versionCode = 1;
+//            }
+//        }
+//        armv7a {
+//            flavorDimension "abi"
+//            ndk {
+//                abiFilter "armeabi-v7a"
+//                versionCode = 3;
+//            }
+//        }
+//        x86 {
+//            flavorDimension "abi"
+//            ndk {
+//                abiFilter "x86"
+//                versionCode = 6;
+//            }
+//        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -26,7 +93,7 @@ android {
         }
 
         release {
-            storeFile file("config/release.keystore")
+            //storeFile file("config/release.keystore")
             storePassword RELEASE_STORE_PASSWORD
             keyAlias RELEASE_KEY_ALIAS
             keyPassword RELEASE_KEY_PASSWORD
@@ -38,12 +105,18 @@ android {
             debuggable true
             jniDebuggable true
             signingConfig signingConfigs.debug
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
 
         release {
             debuggable false
             jniDebuggable false
             signingConfig signingConfigs.release
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
 
         foss {
@@ -71,9 +144,11 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 22
-        versionCode 572
-        versionName "3.0.1"
+        renderscriptTargetApi 22
+        renderscriptSupportModeEnabled true
+        versionCode 265
+        versionName "1.8.5"
     }
 }
diff --git a/TMessagesProj/config/debug/AndroidManifest.xml b/TMessagesProj/config/debug/AndroidManifest.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.telegram.messenger"
-    android:installLocation="auto">
+    android:installLocation="auto"
+    package="com.aniways.anigram.messenger">
 
     <uses-feature android:name="android.hardware.location.gps" android:required="false" />
     <uses-feature android:name="android.hardware.location.network" android:required="false" />
     <uses-feature android:name="android.hardware.location" android:required="false" />
     <uses-feature android:name="android.hardware.LOCATION" android:required="false" />
 
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-    <uses-permission android:name="org.telegram.messenger.permission.MAPS_RECEIVE"/>
-    <uses-permission android:name="org.telegram.messenger.permission.C2D_MESSAGE" />
+    <uses-permission android:name="com.aniways.anigram.messenger.permission.MAPS_RECEIVE"/>
+    <uses-permission android:name="com.aniways.anigram.messenger.permission.C2D_MESSAGE" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-    <permission android:name="org.telegram.messenger.permission.MAPS_RECEIVE" android:protectionLevel="signature"/>
-    <permission android:name="org.telegram.messenger.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <permission android:name="com.aniways.anigram.messenger.permission.MAPS_RECEIVE" android:protectionLevel="signature"/>
+    <permission android:name="com.aniways.anigram.messenger.permission.C2D_MESSAGE" android:protectionLevel="signature" />
 
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/AppName"
         android:theme="@style/Theme.TMessages.Start"
-        android:name=".ApplicationLoader"
+        android:name="org.telegram.messenger.ApplicationLoader"
         android:hardwareAccelerated="@bool/useHardwareAcceleration"
         android:largeHeap="true">
 
-        <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="AIzaSyCTNmNqbWovP9ETcAob98YlrfOQEAC0CJ4" />
+        <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="AIzaSyCTjog9MH1J5JqA0CeylEIDCdaxHGjqYBs" />
 
         <activity android:name="net.hockeyapp.android.UpdateActivity" />
 
@@ -37,7 +37,7 @@
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
                 <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-                <category android:name="org.telegram.messenger" />
+                <category android:name="com.aniways.anigram.messenger" />
             </intent-filter>
         </receiver>
 

diff --git a/TMessagesProj/config/foss/AndroidManifest.xml b/TMessagesProj/config/foss/AndroidManifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.telegram.messenger"
+package="com.aniways.anigram.messenger"
     android:installLocation="auto">
 
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/AppName"
         android:theme="@style/Theme.TMessages.Start"
-        android:name=".ApplicationLoader"
+        android:name="org.telegram.messenger.ApplicationLoader"
         android:hardwareAccelerated="@bool/useHardwareAcceleration"
         android:largeHeap="true">
 

diff --git a/TMessagesProj/config/release/AndroidManifest.xml b/TMessagesProj/config/release/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.telegram.messenger"
+package="com.aniways.anigram.messenger"
     android:installLocation="auto">
 
     <uses-feature android:name="android.hardware.location.gps" android:required="false" />
@@ -9,25 +9,25 @@
     <uses-feature android:name="android.hardware.LOCATION" android:required="false" />
 
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-    <uses-permission android:name="org.telegram.messenger.permission.MAPS_RECEIVE"/>
-    <uses-permission android:name="org.telegram.messenger.permission.C2D_MESSAGE" />
+    <uses-permission android:name="com.aniways.anigram.messenger.permission.MAPS_RECEIVE"/>
+    <uses-permission android:name="com.aniways.anigram.messenger.permission.C2D_MESSAGE" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-    <permission android:name="org.telegram.messenger.permission.MAPS_RECEIVE" android:protectionLevel="signature"/>
-    <permission android:name="org.telegram.messenger.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <permission android:name="com.aniways.anigram.messenger.permission.MAPS_RECEIVE" android:protectionLevel="signature"/>
+    <permission android:name="com.aniways.anigram.messenger.permission.C2D_MESSAGE" android:protectionLevel="signature" />
 
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/AppName"
         android:theme="@style/Theme.TMessages.Start"
-        android:name=".ApplicationLoader"
+        android:name="org.telegram.messenger.ApplicationLoader"
         android:hardwareAccelerated="@bool/useHardwareAcceleration"
         android:largeHeap="true">
 
-        <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="AIzaSyA-t0jLPjUt2FxrA8VPK2EiYHcYcboIR6k" />
+        <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="AIzaSyCTjog9MH1J5JqA0CeylEIDCdaxHGjqYBs" />
 
         <activity android:name="net.hockeyapp.android.UpdateActivity" />
 
@@ -37,7 +37,7 @@
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
                 <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-                <category android:name="org.telegram.messenger" />
+                <category android:name="com.aniways.anigram.messenger" />
             </intent-filter>
         </receiver>
 

diff --git a/TMessagesProj/jni/Application.mk b/TMessagesProj/jni/Application.mk
@@ -1,2 +1,2 @@
 APP_PLATFORM := android-9
-APP_ABI := armeabi armeabi-v7a x86
+APP_ABI := all
diff --git a/TMessagesProj/proguard-rules.txt b/TMessagesProj/proguard-rules.txt
@@ -0,0 +1,70 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:/Program Files (x86)/Android/android-studio/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+#-keep public class com.google.** {*;}
+#-keep class com.google.android.gms.analytics.**
+#-keep class com.google.analytics.tracking.**
+#-keep class com.google.** {*;}
+#-keepclassmembers class com.google.** {*;}
+#-dontwarn com.google.android.gms.analytics.**
+#-dontwarn com.google.analytics.tracking.**
+
+
+-keep class org.telegram.** { *; }
+-keep class com.aniways.** { *; }
+-keep public class com.google.gson
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+# -keep class mypersonalclass.data.model.** { *; }
+
+-keep class android.support.v4.** { *; }
+-keep interface android.support.v4.** { *; }
+
+-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}  # <-- important
+
+# --------Start--------Hockey SDK-------------->
+-keep public class javax.net.ssl.**
+-keepclassmembers public class javax.net.ssl.** { *; }
+
+-keep public class org.apache.http.**
+-keepclassmembers public class org.apache.http.** { *; }
+
+-keepclassmembers class net.hockeyapp.android.UpdateFragment { *; }
+
+-renamesourcefileattribute SourceFile
+-keepattributes SourceFile,LineNumberTable
+# --------End--------Hockey SDK-------------->
+
+
+-dontwarn javax.imageio.**
+-dontwarn java.awt.**
+
+-printseeds seeds.txt
+-printusage unused.txt
+-printmapping mapping.txt
+
+#-libjars sgmmsdk_v171_s5028_connectweb24.jar
+-keep class com.usage.mmsdk.** { *; }
diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.telegram.messenger"
-    android:installLocation="auto">
+    android:installLocation="auto"
+    package="com.aniways.anigram.messenger">
 
     <supports-screens android:anyDensity="true"
                       android:largeScreens="true"
@@ -41,20 +41,23 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:name=".ApplicationLoader"
+        android:name="org.telegram.messenger.ApplicationLoader"
         android:allowBackup="false"
         android:hardwareAccelerated="@bool/useHardwareAcceleration"
         android:icon="@drawable/ic_launcher"
         android:label="@string/AppName"
-        android:largeHeap="true"
+        android:largeHeap="true">
         android:theme="@style/Theme.TMessages.Start">
 
+        <meta-data android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+
         <activity
             android:name="org.telegram.ui.LaunchActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:hardwareAccelerated="@bool/useHardwareAcceleration"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan">
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />