Merge pull request #9 from SmartWalkieOrg/develop

kukuhsain · web-flow · commit 215d16e1d735 · 2022-05-25T19:09:19.000+07:00
Merge develop to master
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,13 +19,23 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         setProperty("archivesBaseName", "vpdemo-$versionName-$versionCode-${getGitHash()}")
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
     }
+    signingConfigs {
+        development {
+            storeFile file("development.keystore")
+            storePassword "voicepingdemo"
+            keyAlias "voicepingdemo"
+            keyPassword "voicepingdemo"
+        }
+    }
     buildTypes {
         release {
+            // Uncomment the following code to sign a development release build
+            //signingConfig signingConfigs.development
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
diff --git a/app/development.keystore b/app/development.keystore
diff --git a/app/src/main/java/com/smartwalkie/voicepingdemo/LoginActivity.kt b/app/src/main/java/com/smartwalkie/voicepingdemo/LoginActivity.kt
@@ -23,7 +23,8 @@ class LoginActivity : AppCompatActivity(), PermissionCallbacks {
         super.onCreate(savedInstanceState)
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        initToolbar()
+        supportActionBar?.title = getString(R.string.app_name)
+        binding.editServerUrl.setText(MyPrefs.serverUrl ?: "")
         binding.buttonConnect.setOnClickListener {
             EasyPermissions.requestPermissions(
                 this@LoginActivity,
@@ -34,16 +35,12 @@ class LoginActivity : AppCompatActivity(), PermissionCallbacks {
         }
     }
 
-    private fun initToolbar() {
-        supportActionBar?.title = getString(R.string.app_name)
-        supportActionBar?.subtitle = "Server: " + VoicePingClientApp.SERVER_URL
-    }
-
     override fun onStart() {
         super.onStart()
         val userId = MyPrefs.userId ?: ""
         val company = MyPrefs.company ?: ""
-        if (userId.isNotBlank() && company.isNotBlank()) {
+        val serverUrl = MyPrefs.serverUrl ?: ""
+        if (userId.isNotBlank() && company.isNotBlank() && serverUrl.isNotBlank()) {
             startActivity(Intent(this, MainActivity::class.java))
             finish()
         }
@@ -74,10 +71,12 @@ class LoginActivity : AppCompatActivity(), PermissionCallbacks {
         // Reset errors.
         binding.editUserId.error = null
         binding.editCompany.error = null
+        binding.editServerUrl.error = null
 
         // Store values at the time of the connect attempt.
         val userId = binding.editUserId.text.toString().trim { it <= ' ' }
         val company = binding.editCompany.text.toString().trim { it <= ' ' }
+        val serverUrl = binding.editServerUrl.text.toString().trim { it <= ' ' }
 
         when {
             userId.isEmpty() -> {
@@ -88,16 +87,21 @@ class LoginActivity : AppCompatActivity(), PermissionCallbacks {
                 binding.editCompany.error = getString(R.string.cannot_be_blank)
                 binding.editCompany.requestFocus()
             }
+            serverUrl.isEmpty() -> {
+                binding.editServerUrl.error = getString(R.string.cannot_be_blank)
+                binding.editServerUrl.requestFocus()
+            }
             else -> {
                 // Show a progress spinner, and kick off a background task to perform the user connect attempt.
                 Utils.closeKeyboard(this, currentFocus)
                 showProgress(true)
-                VoicePing.connect(userId, company, object : ConnectCallback {
+                VoicePing.connect(serverUrl, userId, company, object : ConnectCallback {
                     override fun onConnected() {
                         Log.v(TAG, "onConnected")
                         showProgress(false)
                         MyPrefs.userId = userId
                         MyPrefs.company = company
+                        MyPrefs.serverUrl = serverUrl
                         startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                         finish()
                     }
diff --git a/app/src/main/java/com/smartwalkie/voicepingdemo/MainActivity.kt b/app/src/main/java/com/smartwalkie/voicepingdemo/MainActivity.kt
@@ -39,11 +39,13 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener,
 
         val userId = MyPrefs.userId ?: ""
         val company = MyPrefs.company ?: ""
-        if (userId.isBlank() || company.isBlank()) {
+        val serverUrl = MyPrefs.serverUrl ?: ""
+        if (userId.isBlank() || company.isBlank() || serverUrl.isBlank()) {
             finish()
             return
         }
         initToolbar(userId, company)
+        binding.textServerUrl.text = serverUrl
         val channelTypes = arrayOf("GROUP", "PRIVATE")
         val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, channelTypes)
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -83,7 +85,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener,
         updateConnectionState(VoicePing.getConnectionState())
         VoicePing.setConnectionStateListener(this)
         if (VoicePing.getConnectionState() == ConnectionState.DISCONNECTED) {
-            VoicePing.connect(userId, company, object : ConnectCallback {
+            VoicePing.connect(serverUrl, userId, company, object : ConnectCallback {
                 override fun onConnected() {
                     // Ignored
                 }
diff --git a/app/src/main/java/com/smartwalkie/voicepingdemo/MyPrefs.kt b/app/src/main/java/com/smartwalkie/voicepingdemo/MyPrefs.kt
@@ -9,6 +9,7 @@ object MyPrefs {
 
     private const val USER_ID = "user_id"
     private const val COMPANY = "company"
+    private const val SERVER_URL = "server_url"
 
     var userId: String?
         get() = sharedPrefs.getString(USER_ID, "")
@@ -22,6 +23,12 @@ object MyPrefs {
             sharedPrefs.edit().putString(COMPANY, value).apply()
         }
 
+    var serverUrl: String?
+        get() = sharedPrefs.getString(SERVER_URL, "wss://router-lite.voiceping.info")
+        set(value) {
+            sharedPrefs.edit().putString(SERVER_URL, value).apply()
+        }
+
     fun clear() {
         sharedPrefs.edit().clear().apply()
     }
diff --git a/app/src/main/java/com/smartwalkie/voicepingdemo/VoicePingClientApp.kt b/app/src/main/java/com/smartwalkie/voicepingdemo/VoicePingClientApp.kt
@@ -20,11 +20,10 @@ class VoicePingClientApp : Application() {
             .build()
         val audioSourceText = AudioSourceConfig.getAudioSourceText(audioParam.audioSource)
         Log.d(TAG, "Manufacturer: ${Build.MANUFACTURER}, audio source: $audioSourceText")
-        VoicePing.init(this, SERVER_URL, audioParam)
+        VoicePing.init(this, audioParam)
     }
 
     companion object {
-        const val SERVER_URL: String = "wss://router-lite.voiceping.info"
         lateinit var context: Context
     }
 }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -44,6 +44,19 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/edit_server_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/server_url"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -9,6 +9,23 @@
         android:orientation="vertical"
         android:padding="16dp">
 
+        <TextView
+            style="@style/InputLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Server URL" />
+
+        <TextView
+            android:id="@+id/text_server_url"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="24dp"
+            android:padding="4dp"
+            android:text="Server URL"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
+
         <TextView
             style="@style/InputLabel"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 
     <string name="user_id">User ID</string>
     <string name="company">Company</string>
+    <string name="server_url">Server URL</string>
     <string name="caution_same_company">You can only talk to other users in the same company.</string>
     <string name="sign_in">Enter</string>
     <string name="failed_to_sign_in">Failed to enter, please try again later</string>
diff --git a/voiceping-sdk/build.gradle b/voiceping-sdk/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         setProperty("archivesBaseName", "voiceping-sdk-$versionName")
     }
diff --git a/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/Connection.kt b/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/Connection.kt
@@ -16,7 +16,7 @@ internal interface Connection {
 
     val serverUrl: String?
 
-    fun connect(userId: String, deviceId: String, callback: ConnectCallback)
+    fun connect(serverUrl: String, userId: String, deviceId: String, callback: ConnectCallback)
 
     val connectionState: ConnectionState
 
diff --git a/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/OkConnection.java b/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/OkConnection.java
@@ -45,9 +45,9 @@ class OkConnection implements Connection {
     private final int FAILURE = 400;
 
     private final Context mContext;
-    private final OkHttpClient mOkHttpClient;
+    private OkHttpClient mOkHttpClient;
     private WebSocket mWebSocket;
-    private final String mServerUrl;
+    private String mServerUrl;
     private String mUserId;
     private String mDeviceId;
     private final Handler mMainHandler;
@@ -61,16 +61,9 @@ class OkConnection implements Connection {
     private volatile ConnectionState mConnectionState = ConnectionState.DISCONNECTED;
     private volatile boolean mIsReconnecting;
 
-    OkConnection(Context context, String serverUrl, IncomingAudioListener listener, Looper backgroundLooper) {
+    OkConnection(Context context, IncomingAudioListener listener, Looper backgroundLooper) {
         mContext = context;
-        if (serverUrl != null && !serverUrl.isEmpty()) {
-            if (serverUrl.endsWith("/")) {
-                serverUrl = serverUrl.substring(0, serverUrl.length() - 1);
-            }
-        }
-        mServerUrl = serverUrl;
         mIncomingAudioListener = listener;
-        mOkHttpClient = createHttpClient(serverUrl);
         mMainHandler = new Handler(Looper.getMainLooper());
         mBackgroundHandler = new Handler(backgroundLooper, new Handler.Callback() {
 
@@ -236,16 +229,20 @@ public String getServerUrl() {
     }
 
     @Override
-    public void connect(String userId, String deviceId, ConnectCallback callback) {
+    public void connect(@NotNull String serverUrl, @NotNull String userId, @NotNull String deviceId, @NotNull ConnectCallback callback) {
         if (!NetworkUtil.isNetworkConnected(mContext)) {
             callback.onFailed(new VoicePingException("Please check your internet connection!", ErrorCode.INTERNET_DISCONNECTED));
             return;
         }
+        if (serverUrl.isEmpty() || userId.isEmpty() || deviceId.isEmpty()) {
+            callback.onFailed(new VoicePingException("Invalid parameters!", ErrorCode.INTERNET_DISCONNECTED));
+            return;
+        }
+        mServerUrl = serverUrl;
+        mOkHttpClient = createHttpClient(serverUrl);
         mUserId = userId;
         mDeviceId = deviceId;
-        if (callback != null) {
-            mConnectCallback = callback;
-        }
+        mConnectCallback = callback;
         connect();
     }
 
@@ -265,6 +262,8 @@ private void updateConnectionState(ConnectionState connectionState) {
     }
 
     private void connect() {
+        if (mServerUrl == null || mServerUrl.isEmpty()) return;
+        if (mOkHttpClient == null) return;
         updateConnectionState(ConnectionState.CONNECTING);
         Request request = new Request.Builder().url(mServerUrl)
                 .addHeader("VoicePingToken", mUserId != null ? mUserId : "")
diff --git a/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/Player.java b/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/Player.java
@@ -32,7 +32,7 @@ class Player implements IncomingAudioListener {
 
     private final Context mContext;
     private AudioParam mAudioParam;
-    private final String mServerUrl;
+    private String mServerUrl;
     private Opus mOpus;
     private AudioTrack mAudioTrack;
     private final Handler mBackgroundHandler;
@@ -152,6 +152,10 @@ public void setAudioParam(AudioParam audioParam) {
         mOpus = new Opus(audioParam.getSampleRate(), audioParam.getChannelSize());
     }
 
+    public void setServerUrl(String serverUrl) {
+        mServerUrl = serverUrl;
+    }
+
     public void setIncomingTalkListener(IncomingTalkListener listener) {
         mIncomingTalkListener = listener;
     }
diff --git a/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/VoicePing.kt b/voiceping-sdk/src/main/java/com/smartwalkie/voicepingsdk/VoicePing.kt
@@ -1,19 +1,20 @@
 package com.smartwalkie.voicepingsdk
 
 import android.content.Context
-import com.smartwalkie.voicepingsdk.model.AudioParam
+import android.os.Build
+import android.os.HandlerThread
 import com.smartwalkie.voicepingsdk.callback.ConnectCallback
 import com.smartwalkie.voicepingsdk.callback.DisconnectCallback
+import com.smartwalkie.voicepingsdk.listener.ConnectionStateListener
 import com.smartwalkie.voicepingsdk.listener.IncomingTalkListener
 import com.smartwalkie.voicepingsdk.listener.OutgoingTalkCallback
-import android.os.Build
-import android.os.HandlerThread
-import com.smartwalkie.voicepingsdk.listener.ConnectionStateListener
+import com.smartwalkie.voicepingsdk.model.AudioParam
 
 /**
  * Main class of VoicePing.
  */
 object VoicePing {
+    private const val DEFAULT_SERVER_URL: String = "wss://router-lite.voiceping.info"
     private lateinit var audioParam: AudioParam
     private lateinit var player: Player
     private lateinit var connection: Connection
@@ -26,25 +27,23 @@ object VoicePing {
      * Initialize VoicePing. This process should be done in onCreate of your Application class
      *
      * @param context   Application Context
-     * @param serverUrl The URL of VoicePing SDK server
      */
-    fun init(context: Context, serverUrl: String) {
-        init(context, serverUrl, AudioParam.Builder().build())
+    fun init(context: Context) {
+        init(context, AudioParam.Builder().build())
     }
 
     /**
      * Initialize VoicePing. This process should be done in onCreate of your Application class
      *
      * @param context   Application Context
-     * @param serverUrl The URL of VoicePing SDK server
      * @param audioParam Audio parameters
      */
-    fun init(context: Context, serverUrl: String, audioParam: AudioParam) {
+    fun init(context: Context, audioParam: AudioParam) {
         this.audioParam = audioParam
         val voicePingThread = HandlerThread("VoicePingThread", Thread.MAX_PRIORITY)
         voicePingThread.start()
-        player = Player(context, audioParam, serverUrl, voicePingThread.looper)
-        connection = OkConnection(context, serverUrl, player, voicePingThread.looper)
+        player = Player(context, audioParam, DEFAULT_SERVER_URL, voicePingThread.looper)
+        connection = OkConnection(context, player, voicePingThread.looper)
         recorder = Recorder(context, connection, audioParam, voicePingThread.looper)
         connection.setOutgoingAudioListener(recorder)
     }
@@ -57,11 +56,29 @@ object VoicePing {
      * @param callback Callback
      */
     fun connect(userId: String, company: String, callback: ConnectCallback) {
+        connect(DEFAULT_SERVER_URL, userId, company, callback)
+    }
+
+    /**
+     * Connect to server. This method can be assumed as sign in to server. After the user connected
+     * to server, the user can then receive PTT from any other user using private channel.
+     *
+     * @param serverUrl Server URL
+     * @param userId    User ID or Username
+     * @param callback  Callback
+     */
+    fun connect(serverUrl: String, userId: String, company: String, callback: ConnectCallback) {
+        val realServerUrl = when {
+            serverUrl.isBlank() -> DEFAULT_SERVER_URL
+            serverUrl.endsWith("/") -> serverUrl.substring(0, serverUrl.length - 1)
+            else -> serverUrl
+        }
         this.userId = userId
         this.company = company
         val deviceId =
             "${Build.MANUFACTURER}_${Build.MODEL}_${Build.FINGERPRINT}_${Build.BOOTLOADER}_${Build.DISPLAY}_${Build.HOST}"
-        connection.connect(getFullUserId(), deviceId, callback)
+        player.setServerUrl(realServerUrl)
+        connection.connect(realServerUrl, getFullUserId(), deviceId, callback)
         recorder.setUserId(getFullUserId())
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,10 @@ class VoicePingClientApp : Application() {`
`20`	`20`	`.build()`
`21`	`21`	`val audioSourceText = AudioSourceConfig.getAudioSourceText(audioParam.audioSource)`
`22`	`22`	`Log.d(TAG, "Manufacturer: ${Build.MANUFACTURER}, audio source: $audioSourceText")`
`23`		`- VoicePing.init(this, SERVER_URL, audioParam)`
	`23`	`+ VoicePing.init(this, audioParam)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`companion object {`
`27`		`- const val SERVER_URL: String = "wss://router-lite.voiceping.info"`
`28`	`27`	`lateinit var context: Context`
`29`	`28`	`}`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ android {`
`11`	`11`	`minSdkVersion 16`
`12`	`12`	`targetSdkVersion 30`
`13`	`13`	`versionCode 1`
`14`		`- versionName "1.0.0"`
	`14`	`+ versionName "1.1.0"`
`15`	`15`	`testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
`16`	`16`	`setProperty("archivesBaseName", "voiceping-sdk-$versionName")`
`17`	`17`	`}`