Skip to content

Commit cf9cb58

Browse files
AhmedHanafy725AhmedHanafy725
committed
Merge branch 'main' of github.com:threefoldtech/threefold_connect into main
2 parents 037e07f + f63d244 commit cf9cb58

58 files changed

Lines changed: 1032 additions & 1601 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ example/public/config.js
316316

317317
openkyc/*
318318
Makefile
319-
*pubspec.lock
319+
# *pubspec.lock
320320
app/lib/app_config_local.dart
321321
app/android/app/src/main/AndroidManifest.xml
322322
app/lib/helpers/env_config.dart

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ If you own a Threefold node, you can manage your farm here.
2626

2727
If you have Threefold related questions, we provide a support chat where we will answer your questions as soon as possible!
2828

29-
### Planetary network
30-
31-
It is possible to have a a planetary network IPv6 address. Here you can enable the planetary network connection and your phone will automatically be connected to the p2p network.
3229

3330
### Identity
3431

‎app/android/app/src/main/AndroidManifest_local‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.local">
22
<application tools:replace="android:label" android:label="3Bot Local" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
3-
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
4-
<intent-filter>
5-
<action android:name="android.net.VpnService" />
6-
</intent-filter>
7-
</service>
83
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
94
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
105
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
@@ -49,4 +44,4 @@
4944

5045
<uses-feature android:name="android.hardware.camera.autofocus" />
5146
<uses-feature android:name="android.hardware.camera" />
52-
</manifest>
47+
</manifest>

‎app/android/app/src/main/AndroidManifest_production‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin">
22
<application tools:replace="android:label" android:label="Threefold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
3-
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
4-
<intent-filter>
5-
<action android:name="android.net.VpnService" />
6-
</intent-filter>
7-
</service>
83
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
94
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
105
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />

‎app/android/app/src/main/AndroidManifest_staging‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.staging">
22
<application tools:replace="android:label" android:label="3Bot Staging" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
3-
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
4-
<intent-filter>
5-
<action android:name="android.net.VpnService" />
6-
</intent-filter>
7-
</service>
83
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
94
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
105
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />

‎app/android/app/src/main/AndroidManifest_testing‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.testing">
22
<application tools:replace="android:label" android:label="3Bot Testing" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
3-
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
4-
<intent-filter>
5-
<action android:name="android.net.VpnService" />
6-
</intent-filter>
7-
</service>
83
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
94
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
105
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />

‎app/android/settings.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
include ':yggdrasil'
21
include ':app'
32

43
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()

‎app/android/yggdrasil/build.gradle‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎app/android/yggdrasil/yggdrasil.aar‎

-8.41 MB
Binary file not shown.

‎app/ios/Frameworks/Yggdrasil.xcframework/Info.plist‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)