Modified .NET Transport layer to return TangoMessage<Response> for a request !!!

17 files changed, 12 insertions, 277 deletions

diff --git a/Software/Android_Studio/Tango.BL/.gitignore b/Software/Android_Studio/Tango.BL/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/Software/Android_Studio/Tango.BL/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/Software/Android_Studio/Tango.BL/CMakeLists.txt b/Software/Android_Studio/Tango.BL/CMakeLists.txt
deleted file mode 100644
index 201e7c537..000000000
--- a/Software/Android_Studio/Tango.BL/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# For more information about using CMake with Android Studio, read the
-# documentation: https://d.android.com/studio/projects/add-native-code.html
-
-# Sets the minimum version of CMake required to build the native library.
-
-cmake_minimum_required(VERSION 3.4.1)
-
-# Creates and names a library, sets it as either STATIC
-# or SHARED, and provides the relative paths to its source code.
-# You can define multiple libraries, and CMake builds them for you.
-# Gradle automatically packages shared libraries with your APK.
-
-add_library( # Sets the name of the library.
-             native-lib
-
-             # Sets the library as a shared library.
-             SHARED
-
-             # Provides a relative path to your source file(s).
-             src/main/cpp/native-lib.cpp
-             src/main/cpp/OtherClass.cpp )
-
-# Searches for a specified prebuilt library and stores the path as a
-# variable. Because CMake includes system libraries in the search path by
-# default, you only need to specify the name of the public NDK library
-# you want to add. CMake verifies that the library exists before
-# completing its build.
-
-find_library( # Sets the name of the path variable.
-              log-lib
-
-              # Specifies the name of the NDK library that
-              # you want CMake to locate.
-              log )
-
-# Specifies libraries CMake should link to your target library. You
-# can link multiple libraries, such as libraries you define in this
-# build script, prebuilt third-party libraries, or system libraries.
-
-target_link_libraries( # Specifies the target library.
-                       native-lib
-
-                       # Links the target library to the log library
-                       # included in the NDK.
-                       ${log-lib} )
\ No newline at end of file
diff --git a/Software/Android_Studio/Tango.BL/build.gradle b/Software/Android_Studio/Tango.BL/build.gradle
deleted file mode 100644
index f93ac6d3d..000000000
--- a/Software/Android_Studio/Tango.BL/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
-
-    defaultConfig {
-        minSdkVersion 22
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {
-                cppFlags "-std=c++11 -frtti -fexceptions"
-            }
-        }
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    externalNativeBuild {
-        cmake {
-            path "CMakeLists.txt"
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-}
diff --git a/Software/Android_Studio/Tango.BL/proguard-rules.pro b/Software/Android_Studio/Tango.BL/proguard-rules.pro
deleted file mode 100644
index a0eef131a..000000000
--- a/Software/Android_Studio/Tango.BL/proguard-rules.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Roy\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/Software/Android_Studio/Tango.BL/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango.BL/src/main/AndroidManifest.xml
deleted file mode 100644
index 29e67ea39..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twine.tango.bl" />
diff --git a/Software/Android_Studio/Tango.BL/src/main/cpp/Android.mk b/Software/Android_Studio/Tango.BL/src/main/cpp/Android.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/cpp/Android.mk
+++ /dev/null
diff --git a/Software/Android_Studio/Tango.BL/src/main/cpp/OtherClass.cpp b/Software/Android_Studio/Tango.BL/src/main/cpp/OtherClass.cpp
deleted file mode 100644
index 50d6304dd..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/cpp/OtherClass.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Created by Roy on 11/5/2017.
-//
-
-#include "OtherClass.h"
-
-string OtherClass::getString(string str) {
-    return str;
-}
diff --git a/Software/Android_Studio/Tango.BL/src/main/cpp/OtherClass.h b/Software/Android_Studio/Tango.BL/src/main/cpp/OtherClass.h
deleted file mode 100644
index 0efe65b71..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/cpp/OtherClass.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Created by Roy on 11/5/2017.
-//
-#include <string>
-
-using namespace std;
-
-#ifndef ANDROID_STUDIO_OTHERCLASS_H
-#define ANDROID_STUDIO_OTHERCLASS_H
-
-
-class OtherClass {
-
-public:
-    string getString(string str);
-};
-
-
-#endif //ANDROID_STUDIO_OTHERCLASS_H
diff --git a/Software/Android_Studio/Tango.BL/src/main/cpp/native-lib.cpp b/Software/Android_Studio/Tango.BL/src/main/cpp/native-lib.cpp
deleted file mode 100644
index c7317d615..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/cpp/native-lib.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <jni.h>
-#include <string>
-#include "OtherClass.h"
-
-extern "C"
-JNIEXPORT jstring
-
-JNICALL
-Java_com_twine_tango_bl_Example_getString(
-        JNIEnv *env,
-        jobject /* this */)
-{
-
-    OtherClass c;
-
-    std::string hello = "Hello from C++" + c.getString(" Some String");
-    return env->NewStringUTF(hello.c_str());
-}
diff --git a/Software/Android_Studio/Tango.BL/src/main/java/com/twine/tango/bl/Example.java b/Software/Android_Studio/Tango.BL/src/main/java/com/twine/tango/bl/Example.java
deleted file mode 100644
index 992ddf16f..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/java/com/twine/tango/bl/Example.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.twine.tango.bl;
-
-import android.util.Log;
-
-/**
- * Created by Roy on 11/2/2017.
- */
-
-public class Example {
-    public native String getString();
-
-    static {
-        System.loadLibrary("native-lib");
-    }
-
-    public void Do()
-    {
-        String a = getString();
-        Log.i("NATIVE NATIVE",a);
-    }
-}
diff --git a/Software/Android_Studio/Tango.BL/src/main/res/values/strings.xml b/Software/Android_Studio/Tango.BL/src/main/res/values/strings.xml
deleted file mode 100644
index 5c465ac04..000000000
--- a/Software/Android_Studio/Tango.BL/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Tango.BL</string>
-</resources>
diff --git a/Software/Android_Studio/Tango.Synchronization/.gitignore b/Software/Android_Studio/Tango.Synchronization/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/Software/Android_Studio/Tango.Synchronization/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/Software/Android_Studio/Tango.Synchronization/build.gradle b/Software/Android_Studio/Tango.Synchronization/build.gradle
deleted file mode 100644
index a8a33e319..000000000
--- a/Software/Android_Studio/Tango.Synchronization/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
-
-    defaultConfig {
-        minSdkVersion 22
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        multiDexEnabled true
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation project(':Tango.PMR')
-    implementation project(':Tango.Web')
-    compile globalDependencies.logging
-    compile globalDependencies.storage
-    compile globalDependencies.dagger
-    compile globalDependencies.daggerAndroid
-    implementation project(':Tango.DAL')
-    implementation project(':Tango.Integration')
-    compile globalDependencies.rxJava
-    compile globalDependencies.rxJavaAndroid
-    implementation project(':Tango.Transport')
-}
diff --git a/Software/Android_Studio/Tango.Synchronization/proguard-rules.pro b/Software/Android_Studio/Tango.Synchronization/proguard-rules.pro
deleted file mode 100644
index a0eef131a..000000000
--- a/Software/Android_Studio/Tango.Synchronization/proguard-rules.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Roy\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/Software/Android_Studio/Tango.Synchronization/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango.Synchronization/src/main/AndroidManifest.xml
deleted file mode 100644
index 0f9821a96..000000000
--- a/Software/Android_Studio/Tango.Synchronization/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twine.tango.synchronization" />
diff --git a/Software/Android_Studio/Tango.Synchronization/src/main/res/values/strings.xml b/Software/Android_Studio/Tango.Synchronization/src/main/res/values/strings.xml
deleted file mode 100644
index f4a346f34..000000000
--- a/Software/Android_Studio/Tango.Synchronization/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Tango.Synchronization</string>
-</resources>
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
index 4713fb6cc..4635bec7a 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
@@ -36,18 +36,18 @@ public class Synchronization_TST
             XLog.i(org.getName());
         }
         
-        ISynchronizationService synchronizer = new SynchronizationService(new MachineIdentityProvider());
+        //ISynchronizationService synchronizer = new SynchronizationService(new MachineIdentityProvider());
         
-        synchronizer.synchronizeDB().subscribe(() ->
-        {
-            for (Organization org : TangoDAO.getAllOrganizations())
-            {
-                XLog.i(org.getName());
-            }
-        
-        }, (ex) ->
-        {
-            ex.printStackTrace();
-        });
+//        synchronizer.synchronizeDB().subscribe(() ->
+//        {
+//            for (Organization org : TangoDAO.getAllOrganizations())
+//            {
+//                XLog.i(org.getName());
+//            }
+//
+//        }, (ex) ->
+//        {
+//            ex.printStackTrace();
+//        });
     }
 }