Resolved final merge conflicts, and fixed a bug related to a TFTPacke…

…t data type (I added git add . behind dataPackets)
Tribler · May 3, 2021 · 4b40419 · 4b40419
2 parents 7e1f92f + 2d0f630
commit 4b40419
Show file tree

Hide file tree

Showing 193 changed files with 7,217 additions and 836 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,8 @@ build
 *.iml
 local.properties
 .gradle
+gossipML/.cxx
+**.project
+**.settings
+**.classpath
+.vscode/
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "kotlin-ipv8"]
 	path = kotlin-ipv8
-	url = [email protected]:Tribler/kotlin-ipv8.git
+	url = https://github.com/Tribler/kotlin-ipv8.git
+[submodule "gossipML/superapp-essentia"]
+	path = gossipML/superapp-essentia
+	url = https://github.com/Tribler/superapp-essentia.git
diff --git a/app-debug.apk b/app-debug.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,18 +1,19 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: "androidx.navigation.safeargs"
+apply plugin: 'androidx.navigation.safeargs'
 apply plugin: 'org.jlleitschuh.gradle.ktlint'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlinx-serialization'
 
 buildscript {
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
     }
 }
 
@@ -67,6 +68,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = "1.8"
         allWarningsAsErrors = true
@@ -86,6 +88,16 @@ repositories {
     maven {
         url = 'https://raw.githubusercontent.com/blockchain/api-v1-client-java/mvn-repo/'
     }
+    mavenCentral()
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        flatDir {
+            dirs '../common/libs'
+        }
+    }
 }
 
 allprojects {
@@ -98,40 +110,52 @@ allprojects {
 }
 
 dependencies {
-    implementation project(':common')
     implementation project(':trustchain-voter')
     implementation project(':trustchain-explorer')
     implementation project(':trustchain-trader')
     implementation project(':trustchain-payloadgenerator')
     implementation project(':debug')
     implementation project(':distributedai')
-    implementation project(':currencyii')
     implementation project(':freedomOfComputing')
-    implementation project(':musicdao')
     implementation project(':peerchat')
     implementation project(':eurotoken')
     implementation project(':liquidity-pool')
+    implementation project(':ig-ssi')
+    api(project(':common')){
+        exclude group: 'net.java.dev.jna'
+    }
+    api(project(':currencyii')){
+        exclude group: 'net.java.dev.jna'
+    }
+    api(project(':musicdao')){
+        exclude group: 'net.java.dev.jna'
+    }
+    api(project(':gossipML')){
+        exclude group: 'net.java.dev.jna'
+    }
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc'
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.preference:preference:1.1.0"
+    implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // Firebase
-    implementation 'com.google.firebase:firebase-analytics:17.5.0'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
+    implementation 'com.google.firebase:firebase-analytics:18.0.2'
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
 
     // Material
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.3.0'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -141,16 +165,18 @@ dependencies {
 
     // Logging
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
-    implementation 'com.github.tony19:logback-android:2.0.0'
+    implementation ('net.java.dev.jna:jna:5.5.0@aar')
+    implementation('com.github.tony19:logback-android:2.0.0')
 
-    implementation 'com.mattskala:itemadapter:0.3'
+    implementation 'com.mattskala:itemadapter:0.4'
 
     // Testing
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
+
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
         "-Xuse-experimental=kotlin.Experimental,kotlin.ExperimentalUnsignedTypes",

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,17 @@
             android:name="nl.tudelft.trustchain.explorer.ui.TrustChainExplorerActivity"
             android:parentActivityName=".ui.dashboard.DashboardActivity" />
 
+        <activity
+            android:name="nl.tudelft.trustchain.ssi.SSIMainActivity"
+            android:parentActivityName=".ui.dashboard.DashboardActivity"
+            android:theme="@style/Theme.SSI" />
+
+        <activity
+            android:name="nl.tudelft.trustchain.common.ui.QRCodeActivityPortrait"
+            android:screenOrientation="portrait"
+            android:stateNotNeeded="true"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+
         <activity
             android:name="nl.tudelft.trustchain.debug.DebugActivity"
             android:parentActivityName=".ui.dashboard.DashboardActivity" />
@@ -94,6 +105,7 @@
         </activity>
 
         <service android:name="nl.tudelft.trustchain.app.service.TrustChainService" />
+
         <service
             android:name="com.example.musicdao.MusicGossipingService"
             android:enabled="true"

diff --git a/app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt b/app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt
@@ -6,12 +6,14 @@ import androidx.annotation.DrawableRes
 import com.example.musicdao.MusicService
 import nl.tudelft.trustchain.FOC.MainActivityFOC
 import nl.tudelft.trustchain.common.R
+import nl.tudelft.trustchain.explorer.ui.TrustChainExplorerActivity
 import nl.tudelft.trustchain.currencyii.CurrencyIIMainActivity
 import nl.tudelft.trustchain.debug.DebugActivity
 import nl.tudelft.trustchain.distributedAI.DistributedActivity
 import nl.tudelft.trustchain.eurotoken.EuroTokenMainActivity
 import nl.tudelft.trustchain.explorer.ui.TrustChainExplorerActivity
 import nl.tudelft.trustchain.liquidity.LiquidityPoolMainActivity
+import nl.tudelft.trustchain.ssi.SSIMainActivity
 import nl.tudelft.trustchain.payloadgenerator.ui.TrustChainPayloadGeneratorActivity
 import nl.tudelft.trustchain.peerchat.PeerChatActivity
 import nl.tudelft.trustchain.trader.ui.TrustChainTraderActivity
@@ -21,8 +23,16 @@ enum class AppDefinition(
     @DrawableRes val icon: Int,
     val appName: String,
     @ColorRes val color: Int,
-    val activity: Class<out Activity>
+    val activity: Class<out Activity>,
+    val disableImageTint: Boolean = false
 ) {
+    EIGHTEEN_PLUS(
+        R.drawable.ic_18_plus,
+        "18+",
+        R.color.red,
+        SSIMainActivity::class.java,
+        true,
+    ),
     PEERCHAT(
         R.drawable.ic_chat_black_24dp,
         "PeerChat",