diff --git a/.gitignore b/.gitignore
index e48ef1992f..56580994de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,47 +1,25 @@
-# Generated files
-bin/
-gen/
-
-# Gradle files
-.gradle/
-build/
-.cxx
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Android Studio files
+# From Android Studio template
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
.DS_Store
+/build
+/captures
.externalNativeBuild
+.cxx
+local.properties
-# Intellij
-*.iml
-.idea/workspace.xml
-.idea/libraries
-.idea/misc.xml
-.idea/caches/*
-.idea/codeStyles/codeStyleConfig.xml
-
+# Custom settings
+/.idea/misc.xml
+/release
+/docker-mailserver/maildata_volume/
# Keystore files
*.jks
-
# keystore info
-FlowCrypt/keystore.properties
-
-FlowCrypt/src/main/assets/.idea/vcs.xml
-FlowCrypt/src/main/assets/.idea/workspace.xml
-
-release/*.apk
-docker-mailserver/maildata_volume/
+/FlowCrypt/keystore.properties
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d156937bb..b8ebed962e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -17,7 +17,16 @@
+
+
+
+
+
+
+
+
+
@@ -130,5 +139,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 6bb2ff594e..79ee123c2b 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3a8542cc2f..c7f4e06668 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index e9de20d3b3..be946ad622 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -75,7 +75,7 @@ blocks:
- name: 'Testing'
execution_time_limit:
- minutes: 30
+ minutes: 40
task:
jobs:
- name: 'JUnit tests'
diff --git a/FlowCrypt/src/main/assets/.idea/.name b/FlowCrypt/src/main/assets/.idea/.name
deleted file mode 100644
index 64bee8480e..0000000000
--- a/FlowCrypt/src/main/assets/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-flowcrypt-android
\ No newline at end of file
diff --git a/FlowCrypt/src/main/assets/.idea/inspectionProfiles/Project_Default.xml b/FlowCrypt/src/main/assets/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 2e5bf33058..0000000000
--- a/FlowCrypt/src/main/assets/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/FlowCrypt/src/main/assets/.idea/modules.xml b/FlowCrypt/src/main/assets/.idea/modules.xml
deleted file mode 100644
index 8dacbad5b6..0000000000
--- a/FlowCrypt/src/main/assets/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file