Merge pull request #3 from RooyeKhat-Media/master

Update Matched V 0.0.25

app/build.gradle

@@ -14,6 +14,8 @@ repositories {
  maven { url 'https://maven.fabric.io/public' }
 }
 
+
+
 apply plugin: 'realm-android'
 
 android {
@@ -24,8 +26,8 @@ android {
  applicationId "net.iGap"
  minSdkVersion 15
  targetSdkVersion 25
- versionCode 23
- versionName "0.0.23"
+ versionCode 25
+ versionName "0.0.25"
  multiDexEnabled true
  vectorDrawables.useSupportLibrary = true
  }
@@ -62,7 +64,7 @@ dependencies {
  compile project(':emoji')
  compile project(':audioplayerview')
  compile project(':websocket')
- compile('com.afollestad.material-dialogs:core:0.9.4.4') {
+ compile('com.afollestad.material-dialogs:core:0.9.4.5') {
  transitive = true
  }
  compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {

app/src/main/AndroidManifest.xml

@@ -6,11 +6,11 @@
  android:allowBackup="false"
  android:label="@string/app_name">
 
- <uses-permission android:name="android.permission.CAMERA" />
 
  <uses-feature android:name="android.hardware.camera" />
  <uses-feature android:name="android.hardware.camera.autofocus" />
 
+ <uses-permission android:name="android.permission.CAMERA" />
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
  <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
@@ -28,6 +28,7 @@
  <uses-permission android:name="android.permission.WAKE_LOCK" />
  <uses-permission android:name="android.permission.READ_LOGS" />
 
+
  <application
  android:name=".G"
  android:configChanges="locale"
@@ -83,6 +84,24 @@
  </intent-filter>
  </activity>
 
+
+ <activity
+ android:name=".activities.ActivityCall"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|locale">
+
+
+ <!--
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="http" android:host="@string/host" />
+ </intent-filter> -->
+
+
+ </activity>
+
+
  <activity
  android:name=".activities.Activity_charge_balance"
  android:configChanges="keyboard|keyboardHidden|orientation|screenSize|locale" />

app/src/main/java/net/iGap/Config.java

@@ -51,6 +51,7 @@ public class Config {
  public static String default_toggleButtonColor = "#31bdb6";
  public static String default_attachmentColor = "#31bdb6";
  public static String default_headerTextColor = "#31bdb6";
+ public static String default_progressColor = "#41c6c4";
 
  public static final String URL_WEBSOCKET = "wss://secure.igap.net/hybrid/";
 

app/src/main/java/net/iGap/G.java

@@ -34,6 +34,14 @@
 import net.iGap.helper.HelperLogMessage;
 import net.iGap.helper.HelperNotificationAndBadge;
 import net.iGap.interfaces.IClientSearchUserName;
+import net.iGap.interfaces.ISignalingAccept;
+import net.iGap.interfaces.ISignalingCallBack;
+import net.iGap.interfaces.ISignalingCondidate;
+import net.iGap.interfaces.ISignalingGetCallLog;
+import net.iGap.interfaces.ISignalingLeave;
+import net.iGap.interfaces.ISignalingOffer;
+import net.iGap.interfaces.ISignalingRinging;
+import net.iGap.interfaces.ISignalingSesionHold;
 import net.iGap.interfaces.OnChangeUserPhotoListener;
 import net.iGap.interfaces.OnChannelAddAdmin;
 import net.iGap.interfaces.OnChannelAddMember;
@@ -163,6 +171,7 @@ public class G extends MultiDexApplication {
  public static ProtoClientCondition.ClientCondition.Builder clientConditionGlobal;
  public static HelperCheckInternetConnection.ConnectivityType latestConnectivityType;
  public static ImageLoader imageLoader;
+ public static ArrayList<Long> deletedRoomList = new ArrayList<>();
 
  public static ArrayList<String> unSecure = new ArrayList<>();
  public static ArrayList<String> unLogin = new ArrayList<>();// list of actionId that can be doing without secure
@@ -196,15 +205,17 @@ public class G extends MultiDexApplication {
  public static String notificationColor;
  public static String toggleButtonColor;
  public static String attachmentColor;
+ public static String progressColor;
  public static String headerTextColor;
  public static String authorHash;
+ public static String displayName;
 
  public static boolean isAppInFg = false;
  public static boolean isScrInFg = false;
  public static boolean isChangeScrFg = false;
  public static boolean isUserStatusOnline = false;
  public static boolean isSecure = false;
- public static boolean allowForConnect = true;
+ public static boolean allowForConnect = true; //
  public static boolean userLogin = false;
  public static boolean socketConnection = false;
  public static boolean canRunReceiver = false;
@@ -216,10 +227,13 @@ public class G extends MultiDexApplication {
  public static boolean latestMobileDataState;
  public static boolean showVoteChannelLayout = true;
  public static boolean showSenderNameInGroup = false;
+ public static boolean needGetSignalingConfiguration = true;
+ public static boolean isInCall = false;
 
  public static int ivSize;
  public static int userTextSize = 0;
  public static int COPY_BUFFER_SIZE = 1024;
+ public static boolean isCalculatKeepMedia = true;
 
  public static long currentTime;
  public static long userId;
@@ -339,6 +353,15 @@ public class G extends MultiDexApplication {
  public static OnGetWallpaper onGetWallpaper;
  public static IClientSearchUserName onClientSearchUserName;
 
+ public static ISignalingOffer iSignalingOffer;
+ public static ISignalingRinging iSignalingRinging;
+ public static ISignalingAccept iSignalingAccept;
+ public static ISignalingCondidate iSignalingCondidate;
+ public static ISignalingLeave iSignalingLeave;
+ public static ISignalingSesionHold iSignalingSesionHold;
+ public static ISignalingGetCallLog iSignalingGetCallLog;
+ public static ISignalingCallBack iSignalingCallBack;
+
  @Override
  public void onCreate() {
  super.onCreate();