aagarwal1012 · aagarwal1012 · Aug 11, 2019 · Aug 11, 2019 · Aug 12, 2019 · Aug 12, 2019
diff --git a/ImageSteganographyLibrary/build.gradle b/ImageSteganographyLibrary/build.gradle
@@ -3,8 +3,6 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 26
 
-
-
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 26
@@ -13,30 +11,38 @@ android {
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-
-
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-    }
 
-}
+        checkTypes {
+            javaCompileOptions.annotationProcessorOptions.
+                    classNames.add("org.checkerframework.checker.androidthreading.AndroidThreadingChecker")
+            // You can pass options like so:
+            // javaCompileOptions.annotationProcessorOptions.arguments.put("warns", "")
+        }
+    }
 
-configurations.all {
-    resolutionStrategy {
-        force 'com.android.support:support-annotations:23.1.1'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
+
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:26.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
+    annotationProcessor 'com.android.support:support-annotations:28.0.0'
+
+    implementation files("E:/gsoc-2019/the-checker-framework/checker-framework/checker/dist/checker-qual.jar")
+    annotationProcessor files("E:/gsoc-2019/the-checker-framework/checker-framework/checker/dist/checker.jar")
 }
diff --git a/...java/com/ayush/imagesteganographylibrary/Text/AsyncTaskCallback/TextDecodingCallback.java b/...java/com/ayush/imagesteganographylibrary/Text/AsyncTaskCallback/TextDecodingCallback.java
@@ -1,5 +1,7 @@
 package com.ayush.imagesteganographylibrary.Text.AsyncTaskCallback;
 
+import android.support.annotation.AnyThread;
+
 import com.ayush.imagesteganographylibrary.Text.ImageSteganography;
 
 /**
@@ -8,8 +10,10 @@
 
 public interface TextDecodingCallback {
 
+    @AnyThread
     void onStartTextEncoding();
 
+    @AnyThread
     void onCompleteTextEncoding(ImageSteganography result);
 
 }
diff --git a/...java/com/ayush/imagesteganographylibrary/Text/AsyncTaskCallback/TextEncodingCallback.java b/...java/com/ayush/imagesteganographylibrary/Text/AsyncTaskCallback/TextEncodingCallback.java
@@ -1,5 +1,7 @@
 package com.ayush.imagesteganographylibrary.Text.AsyncTaskCallback;
 
+import android.support.annotation.AnyThread;
+
 import com.ayush.imagesteganographylibrary.Text.ImageSteganography;
 
 /**
@@ -8,8 +10,10 @@
 
 public interface TextEncodingCallback {
 
+    @AnyThread
     void onStartTextEncoding();
 
+    @AnyThread
     void onCompleteTextEncoding(ImageSteganography result);
 
 }
diff --git a/...anographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/EncodeDecode.java b/...anographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/EncodeDecode.java
@@ -2,6 +2,7 @@
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.support.annotation.WorkerThread;
 import android.util.Log;
 
 import com.ayush.imagesteganographylibrary.Utils.Utility;
@@ -32,6 +33,7 @@ class EncodeDecode {
      * @parameter : progressHandler {A handler interface, for the progress bar}
      */
 
+    @WorkerThread
     private static byte[] encodeMessage(int[] integer_pixel_array, int image_columns, int image_rows,
                                         MessageEncodingStatus messageEncodingStatus, ProgressHandler progressHandler) {
 
@@ -105,6 +107,7 @@ private static byte[] encodeMessage(int[] integer_pixel_array, int image_columns
      * @parameter : encrypted_message {string}
      * @parameter : progressHandler {Progress bar handler}
      */
+    @WorkerThread
     public static List<Bitmap> encodeMessage(List<Bitmap> splitted_images,
                                              String encrypted_message, ProgressHandler progressHandler) {
 
@@ -191,6 +194,7 @@ public static List<Bitmap> encodeMessage(List<Bitmap> splitted_images,
      * @parameter : image_rows {Image height}
      * @parameter : messageDecodingStatus {object}
      */
+    @WorkerThread
     private static void decodeMessage(byte[] byte_pixel_array, int image_columns,
                                       int image_rows, MessageDecodingStatus messageDecodingStatus) {
 
@@ -278,7 +282,7 @@ private static void decodeMessage(byte[] byte_pixel_array, int image_columns,
      * @return : encrypted message {String}
      * @parameter : encodedImages {list of encode chunk images}
      */
-
+    @WorkerThread
     public static String decodeMessage(List<Bitmap> encodedImages) {
 
         //Creating object
@@ -309,6 +313,7 @@ public static String decodeMessage(List<Bitmap> encodedImages) {
      * @return : The number of pixel {integer}
      * @parameter : message {Message to encode}
      */
+    @WorkerThread
     public static int numberOfPixelForMessage(String message) {
         int result = -1;
         if (message != null) {

diff --git a/...phyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/ImageSteganography.java b/...phyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/ImageSteganography.java
@@ -1,6 +1,8 @@
 package com.ayush.imagesteganographylibrary.Text;
 
 import android.graphics.Bitmap;
+import android.support.annotation.AnyThread;
+import android.support.annotation.WorkerThread;
 import android.util.Log;
 
 import com.ayush.imagesteganographylibrary.Utils.Crypto;
@@ -36,6 +38,7 @@ public ImageSteganography() {
         this.encrypted_zip = new byte[0];
     }
 
+    @WorkerThread
     public ImageSteganography(String message, String secret_key, Bitmap image) {
 
         this.message = message;
@@ -58,6 +61,7 @@ public ImageSteganography(String message, String secret_key, Bitmap image) {
 
     }
 
+    @WorkerThread
     public ImageSteganography(String secret_key, Bitmap image) {
         this.secret_key = convertKeyTo128bit(secret_key);
         this.image = image;
@@ -72,6 +76,7 @@ public ImageSteganography(String secret_key, Bitmap image) {
         this.encrypted_zip = new byte[0];
     }
 
+    @WorkerThread
     private static String encryptMessage(String message, String secret_key) {
         Log.d(TAG, "Message : " + message);
 
@@ -93,6 +98,7 @@ private static String encryptMessage(String message, String secret_key) {
         return encrypted_message;
     }
 
+    @WorkerThread
     public static String decryptMessage(String message, String secret_key) {
         String decrypted_message = "";
         if (message != null) {
@@ -110,6 +116,7 @@ public static String decryptMessage(String message, String secret_key) {
         return decrypted_message;
     }
 
+    @WorkerThread
     private static String convertKeyTo128bit(String secret_key) {
 
         StringBuilder result = new StringBuilder(secret_key);

diff --git a/...anographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/TextDecoding.java b/...anographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/TextDecoding.java
@@ -4,6 +4,8 @@
 import android.app.ProgressDialog;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
+import android.support.annotation.UiThread;
+import android.support.annotation.WorkerThread;
 import android.util.Log;
 
 import com.ayush.imagesteganographylibrary.Text.AsyncTaskCallback.TextDecodingCallback;
@@ -34,6 +36,7 @@ public TextDecoding(Activity activity, TextDecodingCallback textDecodingCallback
     }
 
     //setting progress dialog if wanted
+    @UiThread
     public void setProgressDialog(ProgressDialog progressDialog) {
         this.progressDialog = progressDialog;
     }

diff --git a/...anographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/TextEncoding.java b/...anographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Text/TextEncoding.java
@@ -4,6 +4,8 @@
 import android.app.ProgressDialog;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
+import android.support.annotation.UiThread;
+import android.support.annotation.WorkerThread;
 import android.util.Log;
 
 import com.ayush.imagesteganographylibrary.Text.AsyncTaskCallback.TextEncodingCallback;

diff --git a/...eSteganographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Utils/Crypto.java b/...eSteganographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Utils/Crypto.java
@@ -1,5 +1,6 @@
 package com.ayush.imagesteganographylibrary.Utils;
 
+import android.support.annotation.WorkerThread;
 import android.util.Log;
 
 import java.util.Arrays;
@@ -14,6 +15,7 @@ public class Crypto {
     @parameter : Message {String}, Secret key {String}
     @return : Encrypted Message {String}
      */
+    @WorkerThread
     public static String encryptMessage(String message, String secret_key) throws Exception {
 
         // Creating key and cipher
@@ -42,6 +44,7 @@ public static String encryptMessage(String message, String secret_key) throws Ex
     @parameter : Encrypted Message {String}, Secret key {String}
     @return : Message {String}
      */
+    @WorkerThread
     public static String decryptMessage(String encrypted_message, String secret_key) throws Exception {
 
         Log.d("Decrypt", "message: + " + encrypted_message);

diff --git a/...SteganographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Utils/Utility.java b/...SteganographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Utils/Utility.java
@@ -3,6 +3,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.support.annotation.WorkerThread;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ public class Utility {
      * @return : number of Square blocks {Integer}
      * @parameter : number of pixels {Integer}
      */
+    @WorkerThread
     public static int squareBlockNeeded(int pixels) {
         int result;
 
@@ -41,6 +43,7 @@ public static int squareBlockNeeded(int pixels) {
      * @return : List of splitted images {List}
      * @parameter : Image {Bitmap}
      */
+    @WorkerThread
     public static List<Bitmap> splitImage(Bitmap bitmap) {
 
         //For height and width of the small image chunks
@@ -101,6 +104,7 @@ public static List<Bitmap> splitImage(Bitmap bitmap) {
      * @return : Merged Image {Bitmap}
      * @parameter : List {Bitmap}, Original Height {Integer}, Original Width {Integer}
      */
+    @WorkerThread
     public static Bitmap mergeImage(List<Bitmap> images, int original_height, int original_width) {
 
         //Calculating number of Rows and columns of that matrix
@@ -144,7 +148,7 @@ public static Bitmap mergeImage(List<Bitmap> images, int original_height, int or
      * @return : Integer Array
      * @parameter : b {the byte array}
      */
-
+    @WorkerThread
     public static int[] byteArrayToIntArray(byte[] b) {
 
         Log.v("Size byte array", b.length + "");
@@ -176,6 +180,7 @@ public static int[] byteArrayToIntArray(byte[] b) {
      * @return : Integer
      * @parameter :  b {the byte array}
      */
+    @WorkerThread
     public static int byteArrayToInt(byte[] b) {
 
         return byteArrayToInt(b, 0);
@@ -188,6 +193,7 @@ public static int byteArrayToInt(byte[] b) {
      * @return :  Integer
      * @parameter :  b {the byte array}, offset {integer}
      */
+    @WorkerThread
     private static int byteArrayToInt(byte[] b, int offset) {
 
         int value = 0x00000000;
@@ -209,6 +215,7 @@ private static int byteArrayToInt(byte[] b, int offset) {
      * @return : byte Array representing [rgb] values.
      * @parameter : Integer array representing [argb] values.
      */
+    @WorkerThread
     public static byte[] convertArray(int[] array) {
 
         byte[] newarray = new byte[array.length * 3];
@@ -230,6 +237,7 @@ public static byte[] convertArray(int[] array) {
      * @return : true or false {boolean}
      * @parameter : String
      */
+    @WorkerThread
     public static boolean isStringEmpty(String str) {
         boolean result = true;
 

diff --git a/...SteganographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Utils/Zipping.java b/...SteganographyLibrary/src/main/java/com/ayush/imagesteganographylibrary/Utils/Zipping.java
@@ -1,5 +1,7 @@
 package com.ayush.imagesteganographylibrary.Utils;
 
+import android.support.annotation.WorkerThread;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -20,7 +22,7 @@ class Zipping {
     @parameter : Encrypted message {String}
     @return : Compressed byte array
      */
-
+    @WorkerThread
     public static byte[] compress(String string) throws Exception {
 
         ByteArrayOutputStream os = new ByteArrayOutputStream(string.length());
@@ -41,6 +43,7 @@ public static byte[] compress(String string) throws Exception {
     @parameter : byte array
     @return : Uncompressed encrypted_message {String}
      */
+    @WorkerThread
     public static String decompress(byte[] compressed) throws Exception {
 
         ByteArrayInputStream bis = new ByteArrayInputStream(compressed);

diff --git a/app/build.gradle b/app/build.gradle
@@ -22,7 +22,7 @@ android {
 
 configurations.all {
     resolutionStrategy {
-        force 'com.android.support:support-annotations:23.1.1'
+        force 'com.android.support:support-annotations:28.0.0'
     }
 }