Merge pull request #124 from AgoraIO/dev/ios

1. remove rtmp injection in all platforms

Author: plutoless

Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java

@@ -34,7 +34,6 @@
 import io.agora.api.example.examples.advanced.SetAudioProfile;
 import io.agora.api.example.examples.advanced.MultiProcess;
 import io.agora.api.example.examples.advanced.VideoQuickSwitch;
-import io.agora.api.example.examples.advanced.RTMPInjection;
 import io.agora.api.example.examples.advanced.RTMPStreaming;
 import io.agora.api.example.examples.advanced.StreamEncrypt;
 import io.agora.api.example.examples.advanced.SwitchCameraScreenShare;
@@ -112,9 +111,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_to_GeoFencing:
                 fragment = new GeoFencing();
                 break;
-            case R.id.action_mainFragment_to_RTMPInjection:
-                fragment = new RTMPInjection();
-                break;
             case R.id.action_mainFragment_to_RTMPStreaming:
                 fragment = new RTMPStreaming();
                 break;

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ARCore.java

@@ -375,15 +375,6 @@ public void onError(int err)
         {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/AdjustVolume.java

@@ -276,15 +276,6 @@ public void onWarning(int warn) {
         public void onError(int err) {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ChannelEncryption.java

@@ -275,15 +275,6 @@ public void onError(int err)
         {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/CustomRemoteVideoRender.java

@@ -242,15 +242,6 @@ public void onWarning(int warn) {
         public void onError(int err) {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/GeoFencing.java

@@ -278,15 +278,6 @@ public void onError(int err) {
                 handler.post(() -> join.setEnabled(true));
             } else
                 showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/HostAcrossChannel.java

@@ -297,15 +297,6 @@ public void onError(int err)
         {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/InCallReport.java

@@ -275,15 +275,6 @@ public void onError(int err)
         {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/JoinMultipleChannel.java

@@ -343,15 +343,6 @@ public void onWarning(int warn) {
         public void onError(int err) {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java

@@ -299,15 +299,6 @@ public void onWarning(int warn) {
         public void onError(int err) {
             Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
             showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            /** Upload current log file immediately to server.
-             *  only use this when an error occurs
-             *  block before log file upload success or timeout.
-             *
-             *  @return
-             *  - 0: Success.
-             *  - < 0: Failure.
-             */
-            engine.uploadLogFile();
         }
 
         /**Occurs when a user leaves the channel.