Skip to content

Commit

Permalink
Merge pull request #569 from threefoldtech/main_remove_planetary
Browse files Browse the repository at this point in the history
Remove planetary network from the app
  • Loading branch information
AhmedHanafy725 authored Dec 10, 2023
2 parents d527a90 + 60951fd commit f63d244
Show file tree
Hide file tree
Showing 59 changed files with 1,037 additions and 1,601 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ example/public/config.js

openkyc/*
Makefile
*pubspec.lock
# *pubspec.lock
app/lib/app_config_local.dart
app/android/app/src/main/AndroidManifest.xml
app/lib/helpers/env_config.dart
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ If you own a Threefold node, you can manage your farm here.

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

### Planetary network

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.

### Identity

Expand Down
7 changes: 1 addition & 6 deletions app/android/app/src/main/AndroidManifest_local
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.local">
<application tools:replace="android:label" android:label="3Bot Local" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
</service>
<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"
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
Expand Down Expand Up @@ -49,4 +44,4 @@

<uses-feature android:name="android.hardware.camera.autofocus" />
<uses-feature android:name="android.hardware.camera" />
</manifest>
</manifest>
5 changes: 0 additions & 5 deletions app/android/app/src/main/AndroidManifest_production
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin">
<application tools:replace="android:label" android:label="Threefold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
</service>
<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"
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
Expand Down
5 changes: 0 additions & 5 deletions app/android/app/src/main/AndroidManifest_staging
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.staging">
<application tools:replace="android:label" android:label="3Bot Staging" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
</service>
<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"
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
Expand Down
5 changes: 0 additions & 5 deletions app/android/app/src/main/AndroidManifest_testing
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.testing">
<application tools:replace="android:label" android:label="3Bot Testing" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
<service android:name="org.threefold.yggdrasil_plugin.PacketTunnelProvider" android:enabled="true" android:exported="true" android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
</service>
<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"
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
Expand Down
1 change: 0 additions & 1 deletion app/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include ':yggdrasil'
include ':app'

def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
Expand Down
2 changes: 0 additions & 2 deletions app/android/yggdrasil/build.gradle

This file was deleted.

Binary file removed app/android/yggdrasil/yggdrasil.aar
Binary file not shown.
5 changes: 5 additions & 0 deletions app/changelogs/v3.8.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# v3.8.0

- Update dependencies to work with Flutter 3.10.0.
- Fix getting the values from FlagSmith.
- Update to Flutter 3.13.0 and Android SDK 33.
40 changes: 0 additions & 40 deletions app/ios/Frameworks/Yggdrasil.xcframework/Info.plist

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f63d244

Please sign in to comment.