Update version to 3.0.0 snapshot (#117)

* update version

* update version

* update version

* update build gradle

* fix compile issues

* fix compile issues

* revert websocket connection

Author: burak-58

.idea/gradle.xml

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 ext {
     PUBLISH_GROUP_ID = 'io.antmedia'
-    PUBLISH_VERSION = '2.11.1'
+    PUBLISH_VERSION = '3.0.0-SNAPSHOT'
     PUBLISH_ARTIFACT_ID = 'webrtc-android-framework'
 }
 apply from: 'publish-remote.gradle'
@@ -74,7 +74,6 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest','creat
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'androidx.annotation:annotation:1.5.0'
     testImplementation 'junit:junit:4.13.2'

webrtc-android-framework/build.gradle

@@ -6,8 +6,6 @@
 import android.os.Build;
 import android.util.Log;
 
-import androidx.core.app.ActivityCompat;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -18,18 +16,20 @@ public class PermissionHandler {
     public static final int PUBLISH_PERMISSION_REQUEST_CODE = 1;
     public static final int PLAY_PERMISSION_REQUEST_CODE = 2;
 
-
-    public static final String[] BLUETOOTH_PERMISSIONS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ?
-            new String[] {Manifest.permission.BLUETOOTH_CONNECT} : new String[] {} ;
+    public static final String[] BLUETOOTH_PERMISSIONS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+            ? new String[]{Manifest.permission.BLUETOOTH_CONNECT}
+            : new String[]{};
 
     public static final String[] CAMERA_PERMISSIONS =
-            new String[] {Manifest.permission.CAMERA};
+            new String[]{Manifest.permission.CAMERA};
 
     public static final String[] PUBLISH_PERMISSIONS =
-            new String[] {Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO};
+            new String[]{Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO};
 
-    public static final String[] REQUIRED_MINIMUM_PERMISSIONS = {"android.permission.MODIFY_AUDIO_SETTINGS",
-            "android.permission.INTERNET"};
+    public static final String[] REQUIRED_MINIMUM_PERMISSIONS = {
+            Manifest.permission.MODIFY_AUDIO_SETTINGS,
+            Manifest.permission.INTERNET
+    };
 
     public static final String[] FULL_PERMISSIONS = concatArrays(
             BLUETOOTH_PERMISSIONS,
@@ -53,78 +53,80 @@ private static String[] concatArrays(String[]... arrays) {
         return result;
     }
 
-    public static boolean checkCameraPermissions(Activity activity){
+    public static boolean checkCameraPermissions(Activity activity) {
         ArrayList<String> permissions = new ArrayList<>();
         permissions.addAll(Arrays.asList(REQUIRED_MINIMUM_PERMISSIONS));
         permissions.addAll(Arrays.asList(CAMERA_PERMISSIONS));
         return hasPermissions(activity, permissions);
     }
 
-    public static boolean checkPublishPermissions(Activity activity, boolean bluetoothEnabled){
+    public static boolean checkPublishPermissions(Activity activity, boolean bluetoothEnabled) {
         ArrayList<String> permissions = new ArrayList<>();
         permissions.addAll(Arrays.asList(REQUIRED_MINIMUM_PERMISSIONS));
         permissions.addAll(Arrays.asList(PUBLISH_PERMISSIONS));
 
-        if(bluetoothEnabled){
+        if (bluetoothEnabled) {
             permissions.addAll(Arrays.asList(BLUETOOTH_PERMISSIONS));
         }
 
         return hasPermissions(activity, permissions);
     }
 
-    public static boolean checkPlayPermissions(Activity activity, boolean bluetoothEnabled){
+    public static boolean checkPlayPermissions(Activity activity, boolean bluetoothEnabled) {
         ArrayList<String> permissions = new ArrayList<>();
         permissions.addAll(Arrays.asList(REQUIRED_MINIMUM_PERMISSIONS));
-        if(bluetoothEnabled){
+        if (bluetoothEnabled) {
             permissions.addAll(Arrays.asList(BLUETOOTH_PERMISSIONS));
         }
-        return hasPermissions(activity,permissions);
+        return hasPermissions(activity, permissions);
     }
 
     public static void requestPermissions(Activity activity, List<String> permissions, int requestCode) {
-        String[] permissionArray = new String[permissions.size()];
-        permissions.toArray(permissionArray);
-        ActivityCompat.requestPermissions(activity, permissionArray, requestCode);
+        if (activity == null) return;
+        String[] permissionArray = permissions.toArray(new String[0]);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.requestPermissions(permissionArray, requestCode);
+        }
     }
 
     public static boolean hasPermissions(Activity activity, List<String> permissions) {
         if (activity != null && permissions != null) {
             for (String permission : permissions) {
-                if (ActivityCompat.checkSelfPermission(activity, permission)
-                        != PackageManager.PERMISSION_GRANTED) {
-                    Log.w(PermissionHandler.class.getSimpleName(), "Permission required:"+permission);
-                    return false;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    if (activity.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+                        Log.w(PermissionHandler.class.getSimpleName(), "Permission required: " + permission);
+                        return false;
+                    }
                 }
             }
         }
         return true;
     }
 
-    public static void requestCameraPermissions(Activity activity){
+    public static void requestCameraPermissions(Activity activity) {
         ArrayList<String> permissions = new ArrayList<>();
         permissions.addAll(Arrays.asList(REQUIRED_MINIMUM_PERMISSIONS));
         permissions.addAll(Arrays.asList(CAMERA_PERMISSIONS));
         requestPermissions(activity, permissions, CAMERA_PERMISSION_REQUEST_CODE);
     }
 
-    public static void requestPublishPermissions(Activity activity, boolean bluetoothEnabled){
+    public static void requestPublishPermissions(Activity activity, boolean bluetoothEnabled) {
         ArrayList<String> permissions = new ArrayList<>();
         permissions.addAll(Arrays.asList(REQUIRED_MINIMUM_PERMISSIONS));
         permissions.addAll(Arrays.asList(PUBLISH_PERMISSIONS));
 
-        if(bluetoothEnabled){
+        if (bluetoothEnabled) {
             permissions.addAll(Arrays.asList(BLUETOOTH_PERMISSIONS));
         }
         requestPermissions(activity, permissions, PUBLISH_PERMISSION_REQUEST_CODE);
     }
 
-    public static void requestPlayPermissions(Activity activity, boolean bluetoothEnabled){
+    public static void requestPlayPermissions(Activity activity, boolean bluetoothEnabled) {
         ArrayList<String> permissions = new ArrayList<>();
         permissions.addAll(Arrays.asList(REQUIRED_MINIMUM_PERMISSIONS));
-        if(bluetoothEnabled){
+        if (bluetoothEnabled) {
             permissions.addAll(Arrays.asList(BLUETOOTH_PERMISSIONS));
         }
         requestPermissions(activity, permissions, PLAY_PERMISSION_REQUEST_CODE);
     }
 }
-

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/PermissionHandler.java

@@ -72,7 +72,7 @@ public void connect(final String wsUrl) {
         wsServerUrl = wsUrl;
 
         ws = creteWebSocket();
-        Thread connectorThread = new Thread(() -> {
+        //Thread connectorThread = new Thread(() -> {
             try {
                 ws.connect(new URI(wsServerUrl), this);
             } catch (WebSocketException e) {
@@ -82,7 +82,8 @@ public void connect(final String wsUrl) {
                 e.printStackTrace();
                 disconnect(false);
             }
-        });
+        //});
+        /*
         connectorThread.start();
         handler.postDelayed(new Runnable() {
             public void run() {
@@ -92,6 +93,7 @@ public void run() {
                 }
             }
         },WEBSOCKET_CONNECTION_TIMEOUT);
+        */
     }
 
     public void sendTextMessage(String message) {

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketHandler.java

@@ -22,7 +22,7 @@
 import io.antmedia.webrtc_android_sample_app.R;
 import io.antmedia.webrtc_android_sample_app.TestableActivity;
 import io.antmedia.webrtc_android_sample_app.basic.SettingsActivity;
-import io.antmedia.webrtcandroidframework.utility.SoundMeter;
+import io.antmedia.webrtc_android_sample_app.utility.SoundMeter;
 import io.antmedia.webrtcandroidframework.api.DefaultDataChannelObserver;
 import io.antmedia.webrtcandroidframework.api.DefaultWebRTCListener;
 import io.antmedia.webrtcandroidframework.api.IDataChannelObserver;

webrtc-android-framework/src/main/res/values-v17/styles.xml

@@ -94,9 +94,9 @@ private Notification.Action createStopAction() {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             stopPendingIntent = PendingIntent.getForegroundService(this, 0, stopIntent, PendingIntent.FLAG_MUTABLE);
         } else {
-            stopPendingIntent = PendingIntent.getService(this, 0, stopIntent, PendingIntent.FLAG_ONE_SHOT);
+            stopPendingIntent = PendingIntent.getService(this, 0, stopIntent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE);
         }
-        Icon stopIcon = Icon.createWithResource(this, io.antmedia.webrtcandroidframework.R.drawable.abc_vector_test);
+        Icon stopIcon = Icon.createWithResource(this, io.antmedia.webrtcandroidframework.R.drawable.disconnect);
         String stopString = "stop";
         Notification.Action.Builder actionBuilder = new Notification.Action.Builder(stopIcon, stopString, stopPendingIntent);
         return actionBuilder.build();

webrtc-android-framework/src/main/res/values-v21/styles.xml

@@ -1,4 +1,4 @@
-package io.antmedia.webrtcandroidframework.utility;
+package io.antmedia.webrtc_android_sample_app.utility;
 
 public interface LocalAudioLevelListener {
     void onAudioLevelUpdated(double decibelLevel);

webrtc-android-framework/src/main/res/values/styles.xml

@@ -1,12 +1,14 @@
-package io.antmedia.webrtcandroidframework.utility;
+package io.antmedia.webrtc_android_sample_app.utility;
 
 import android.Manifest;
 import android.app.Activity;
 import android.content.pm.PackageManager;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
+
 import androidx.core.app.ActivityCompat;
+
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;