version 4.2

.clang-format

@@ -0,0 +1,89 @@
+# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
+---
+Language: Cpp
+AccessModifierOffset: 0
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: false
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit: 80
+CommentPragmas: '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex: '^<.*\.h>'
+    Priority: 1
+  - Regex: '^<.*'
+    Priority: 2
+  - Regex: '.*'
+    Priority: 3
+IndentCaseLabels: false
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 0
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp03
+TabWidth: 2
+UseTab: Never
+---
+Language: Java
+#BreakAfterJavaFieldAnnotations: false
+...

.gitattributes

@@ -0,0 +1,24 @@
+* text=auto eol=lf
+*.a binary
+*.bat text eol=lf
+*.c text eol=lf
+*.cpp text eol=lf
+*.gradle text eol=lf
+*.h text eol=lf
+*.html text eol=lf
+*.iml text eol=lf
+*.jar binary
+*.java text eol=lf
+*.keystore binary
+*.md text eol=lf
+*.mk text eol=lf
+*.otf binary
+*.png binary
+*.properties text eol=lf
+*.sh text eol=lf
+*.so binary
+*.txt text eol=lf
+*.wav binary
+*.ogg binary
+*.xml text eol=lf
+*.zip binary

.gitignore

@@ -1,4 +1,5 @@
 /local.properties
+/gradle.properties
 /.idea/workspace.xml
 
 # Android generated files #
@@ -24,6 +25,11 @@ Thumbs.db
 ##################
 *~
 
+# Static libraries, created using the buildNative script
+########################################################
+silentphone2/jni/*/libaxolotl++.a
+silentphone2/jni/*/libprotobuf-cpp-lite.a
+
 # Backup files and Android Studio and gradle directories
 ##################
 build/

ImageViewTouch/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java

@@ -35,8 +35,6 @@ public interface OnDrawableChangeListener {
         void onDrawableChanged(Drawable drawable);
     }
 
-    ;
-
     public interface OnLayoutChangeListener {
         /**
          * Callback invoked when the layout bounds changed
@@ -50,8 +48,6 @@ public interface OnLayoutChangeListener {
         void onLayoutChanged(boolean changed, int left, int top, int right, int bottom);
     }
 
-    ;
-
     /**
      * Use this to change the {@link ImageViewTouchBase#setDisplayType(DisplayType)} of
      * this View
@@ -73,8 +69,6 @@ public enum DisplayType {
         FIT_IF_BIGGER
     }
 
-    ;
-
 
     public static final String LOG_TAG = "ImageViewTouchBase";
     protected static final boolean LOG_ENABLED = false;

ImageViewTouch/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java

@@ -82,4 +82,4 @@ public void setAntiAlias(boolean value) {
     public Bitmap getBitmap() {
         return mBitmap;
     }
-}
+}

KeyManagerSupport/src/main/java/com/silentcircle/keymanagersupport/KeyManagerSupport.java

@@ -28,7 +28,7 @@ public interface KeyManagerListener {
         /**
          * The key manager read data during a {@code store*} or {@code update*} call.
          */
-        public void onKeyDataRead();
+        void onKeyDataRead();
 
         /**
          * The support provider received a lock request from the key manager.
@@ -40,7 +40,7 @@ public interface KeyManagerListener {
          * <p/>
          * An applications may take more actions, such as deleting sensitive data or closing connections.
          */
-        public void onKeyManagerLockRequest();
+        void onKeyManagerLockRequest();
 
         /**
          * The support provider received an unlock request from the key manager.
@@ -50,7 +50,7 @@ public interface KeyManagerListener {
          * <p/>
          * An applications may take more actions, such as reading their key data, shared data etc.
          */
-        public void onKeyManagerUnlockRequest();
+        void onKeyManagerUnlockRequest();
     }
 
     @SuppressWarnings("unused")

Makefile

@@ -0,0 +1,14 @@
+.PHONY: all dep clean
+
+all: dep
+	./gradlew assembleDevelop
+
+dep:
+	git submodule update --init --recursive
+	./buildNativeLibs.sh DEVELOP
+	./build_ndk
+	echo "android.useDeprecatedNdk=true" > gradle.properties
+
+clean:
+	git clean -fdx
+	git submodule deinit -f .

README.md

@@ -8,7 +8,7 @@ Silent Phone is Peer-to-peer encrypted calling and video. No keys are stored.
 
 ### What's New In This Update
 
-The sources are updated for version 4.1.3 of the project.
+The sources are updated for version 4.2 of the project.
 
 This version of the project includes Silent Contacts as a subproject.
 

ScContactsContract/src/main/java/com/silentcircle/silentcontacts2/ScBaseColumns.java

@@ -38,11 +38,11 @@ public interface ScBaseColumns {
      * The unique ID for a row.
      * <P>Type: INTEGER (long)</P>
      */
-    public static final String _ID = "_id";
+    String _ID = "_id";
 
     /**
      * The count of rows in a directory.
      * <P>Type: INTEGER</P>
      */
-    public static final String _COUNT = "_count";
+    String _COUNT = "_count";
 }