remove mqtt3 from android sample app

Author: sbSteveK

samples/Android/README.md

@@ -4,11 +4,7 @@
 The Android sample builds an app that can be installed and run on an Android Device. The app builds and allows you
 to run the following [samples](#links-to-individual-sample-readme-files) from aws-iot-device-sdk-java-v2:
 * [Mqtt5PubSub](../Mqtt5/PubSub/README.md)
-* [Mqtt3PubSub](../BasicPubSub/README.md)
 * [KeyChainPubSub](./AndroidKeyChainPubSub/README.md)
-* [Jobs](../Jobs/README.md)
-* [Shadow](../Shadow/README.md)
-* [CognitoConnect](../CognitoConnect/README.md)
 
 *__Jump To:__*
 
@@ -30,7 +26,7 @@ files linked below.
 ### Files required by all samples:
 * `endpoint.txt` - IoT ATS Endpoint
 
-### Required to run Mqtt5PubSub and Mqtt3PubSub samples
+### Required to run Mqtt5PubSub sample
 * `certificate.pem` - IoT Thing Certificate
 * `privatekey.pem` - IoT Thing Private Key
 
@@ -43,15 +39,6 @@ files linked below.
 * `message.txt` - specifies --message CLI argument
 * `count.txt` - specifies --count CLI argument
 
-### Required to run Jobs and Shadow sample
-* `certificate.pem` - IoT Thing Certificate
-* `privatekey.pem` - IoT Thing Private Key
-* `thingName.txt` - IoT Thing Name used by sample
-
-### Required to run Cognito Client sample:
-* `cognitoIdentity.txt` - Cognito identity ID
-* `signingRegion.txt` - Signing region
-
 ### Optional files for all Samples:
 * `rootca.pem` - override the default system trust store
 * `clientId.txt` - specifies --clientId CLI argument
@@ -76,18 +63,8 @@ Android sample app.
 
 [**Mqtt5PubSub**](../Mqtt5/PubSub/README.md)
 
-[**Mqtt3PubSub**](../BasicPubSub/README.md)
-
 [**KeyChainPubSub**](AndroidKeyChainPubSub/README.md)
 
-[**Jobs**](../Jobs/README.md)
-
-[**Shadow**](../Shadow/README.md)
-
-[**CognitoConnect**](../CognitoConnect/README.md)
-
-##### NOTE: The shadow sample does not currently complete on android due to its dependence on stdin keyboard input.
-
 
 # Trouble Shooting
 ### Error: The file name must end with .xml

samples/Android/app/build.gradle

@@ -53,8 +53,6 @@ android {
         main {
             java.srcDir '../../Utils/CommandLineUtils'
             java.srcDir '../../Mqtt5/PubSub/src/main/java'
-            java.srcDir '../../BasicPubSub/src/main/java'
-            java.srcDir '../../CognitoConnect/src/main/java'
             java.srcDir '../AndroidKeyChainPubSub/src/main/java'
             java.srcDir 'src/main/java'
         }

samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.java

@@ -35,10 +35,8 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
     private static final Map<String, String> SAMPLES = new LinkedHashMap<String, String>() {{
         put("Select a Sample",""); // empty default
         put("MQTT5 Publish/Subscribe", "mqtt5.pubsub.PubSub");
-        put("MQTT3 Publish/Subscribe", "pubsub.PubSub");
         put("KeyChain Publish/Subscribe", "androidkeychainpubsub.AndroidKeyChainPubSub");
         put("KeyChain Alias Permission", "load.privateKey");
-        put("Cognito Client", "cognitoconnect.CognitoConnect");
     }};
 
     private static final Logger logger = Logger.getLogger(MainActivity.class.getName());
@@ -232,7 +230,6 @@ private String[] sampleArgs(String sampleClassName){
         // Missing required arguments will return null
         switch(sampleClassName){
             case "mqtt5.pubsub.PubSub":
-            case "pubsub.PubSub":
                 if (!argSetRequired("--cert", "certificate.pem", args) ||
                     !argSetRequired("--key", "privatekey.pem", args)) {
                     return null;
@@ -242,12 +239,6 @@ private String[] sampleArgs(String sampleClassName){
                 argSetOptional("--count", "count.txt", args);
                 break;
 
-            case "cognitoconnect.CognitoConnect":
-                if (!argSetRequired("--cognito_identity", "cognitoIdentity.txt", args) ||
-                    !argSetRequired("--signing_region", "signingRegion.txt", args)) {
-                    return null;
-                }
-                break;
             case "androidkeychainpubsub.AndroidKeyChainPubSub":
                 if (!argSetRequired("--keychain_alias", "keychainAlias.txt", args)) {
                     return null;