Apply style format, run lint/editorconfigCheck during build

Author: developernotes

Makefile

@@ -1,6 +1,6 @@
 .POSIX:
 .PHONY: init clean distclean build-openssl build publish-local-snapshot \
-	publish-local-release publish-remote-snapshot public-remote-release
+	publish-local-release publish-remote-snapshot public-remote-release check
 GRADLE = @./gradlew
 
 init:
@@ -15,11 +15,14 @@ distclean:
 build-openssl:
 	$(GRADLE) buildOpenSSL
 
-build-debug:
+check:
+	$(GRADLE) check
+
+build-debug: check
 	$(GRADLE) android-database-sqlcipher:bundleDebugAar \
 	-PdebugBuild=true
 
-build-release:
+build-release: check
 	$(GRADLE) android-database-sqlcipher:bundleReleaseAar \
 	-PdebugBuild=false
 

android-database-sqlcipher/src/main/aidl/net/sqlcipher/IContentObserver.aidl

@@ -2,16 +2,16 @@
 **
 ** Copyright 2007, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 

android-database-sqlcipher/src/main/cpp/CursorWindow.cpp

@@ -1,16 +1,16 @@
 /*
  * Copyright (C) 2006-2007 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0 
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
@@ -165,7 +165,7 @@ row_slot_t * CursorWindow::getRowSlot(int row)
         chunkPtrOffset = rowChunk - mData + (ROW_SLOT_CHUNK_NUM_ROWS * sizeof(row_slot_t));
     }
     return (row_slot_t *)(rowChunk + (chunkPos * sizeof(row_slot_t)));
-    LOG_WINDOW("exit getRowSlot current row num %d, this row %d", mHeader->numRows, row);    
+    LOG_WINDOW("exit getRowSlot current row num %d, this row %d", mHeader->numRows, row);
 }
 
 row_slot_t * CursorWindow::allocRowSlot()
@@ -216,7 +216,7 @@ field_slot_t * CursorWindow::getFieldSlotWithCheck(int row, int column)
   if (row < 0 || row >= mHeader->numRows || column < 0 || column >= mHeader->numColumns) {
       LOGE("Bad request for field slot %d,%d. numRows = %d, numColumns = %d", row, column, mHeader->numRows, mHeader->numColumns);
       return NULL;
-  }        
+  }
   row_slot_t * rowSlot = getRowSlot(row);
   if (!rowSlot) {
       LOGE("Failed to find rowSlot for row %d", row);
@@ -225,9 +225,9 @@ field_slot_t * CursorWindow::getFieldSlotWithCheck(int row, int column)
   if (rowSlot->offset == 0 || rowSlot->offset >= mSize) {
       LOGE("Invalid rowSlot, offset = %d", rowSlot->offset);
       return NULL;
-  }  
+  }
   int fieldDirOffset = rowSlot->offset;
-  return ((field_slot_t *)offsetToPtr(fieldDirOffset)) + column;  
+  return ((field_slot_t *)offsetToPtr(fieldDirOffset)) + column;
 }
 
 uint32_t CursorWindow::read_field_slot(int row, int column, field_slot_t * slotOut)
@@ -236,7 +236,7 @@ uint32_t CursorWindow::read_field_slot(int row, int column, field_slot_t * slotO
     if (row < 0 || row >= mHeader->numRows || column < 0 || column >= mHeader->numColumns) {
         LOGE("Bad request for field slot %d,%d. numRows = %d, numColumns = %d", row, column, mHeader->numRows, mHeader->numColumns);
         return -1;
-    }        
+    }
     row_slot_t * rowSlot = getRowSlot(row);
     if (!rowSlot) {
         LOGE("Failed to find rowSlot for row %d", row);
@@ -259,7 +259,7 @@ uint32_t CursorWindow::read_field_slot(int row, int column, field_slot_t * slotO
 
 void CursorWindow::copyIn(uint32_t offset, uint8_t const * data, size_t size)
 {
-    assert(offset + size <= mSize);    
+    assert(offset + size <= mSize);
     memcpy(mData + offset, data, size);
 }
 
@@ -364,7 +364,7 @@ bool CursorWindow::getLong(unsigned int row, unsigned int col, int64_t * valueOu
     if (!fieldSlot || fieldSlot->type != FIELD_TYPE_INTEGER) {
         return false;
     }
-    
+
 #if WINDOW_STORAGE_INLINE_NUMERICS
     *valueOut = fieldSlot->data.l;
 #else
@@ -394,7 +394,7 @@ bool CursorWindow::getNull(unsigned int row, unsigned int col, bool * valueOut)
     if (!fieldSlot) {
         return false;
     }
-    
+
     if (fieldSlot->type != FIELD_TYPE_NULL) {
         *valueOut = false;
     } else {

android-database-sqlcipher/src/main/cpp/CursorWindow.h

@@ -1,16 +1,16 @@
 /*
  * Copyright (C) 2006 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0 
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
@@ -170,7 +170,7 @@ class CursorWindow
     row_slot_t *        allocRowSlot();
 
     row_slot_t *        getRowSlot(int row);
-    
+
                         /**
                          * return NULL if Failed to find rowSlot or
                          * Invalid rowSlot

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteDatabase.cpp

@@ -152,7 +152,7 @@ namespace sqlcipher {
     env->ReleaseCharArrayElements(jKey, jKeyChar, JNI_ABORT);
     env->ReleaseStringUTFChars(key, password);
   }
-    
+
   void native_rawExecSQL(JNIEnv* env, jobject object, jstring sql)
   {
     sqlite3 * handle = (sqlite3 *)env->GetLongField(object, offset_db_handle);

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteDebug.cpp

@@ -108,7 +108,7 @@ static int read_mapinfo(FILE *fp,
 
 again:
     skip = 0;
-    
+
     if(fgets(line, 1024, fp) == 0) return 0;
 
     len = strlen(line);
@@ -138,7 +138,7 @@ static int read_mapinfo(FILE *fp,
     if (sscanf(line, "Private_Dirty: %d kB", &private_dirty) != 1) return 0;
     if (fgets(line, 1024, fp) == 0) return 0;
     if (sscanf(line, "Referenced: %d kB", &referenced) != 1) return 0;
-    
+
     if (skip) {
         goto again;
     }
@@ -154,11 +154,11 @@ static void load_maps(int pid, int *sharedPages, int *privatePages)
 {
     char tmp[128];
     FILE *fp;
-    
+
     sprintf(tmp, "/proc/%d/smaps", pid);
     fp = fopen(tmp, "r");
     if (fp == 0) return;
-    
+
     while (read_mapinfo(fp, sharedPages, privatePages) != 0) {
         // Do nothing
     }

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteQuery.cpp

@@ -115,7 +115,7 @@ static jint native_fill_window(JNIEnv* env, jobject object, jobject javaWindow,
     int retryCount;
     int boundParams;
     CursorWindow * window;
-    
+
     if (statement == NULL) {
         LOGE("Invalid statement in fillWindow()");
         jniThrowException(env, "java/lang/IllegalStateException",
@@ -166,8 +166,8 @@ static jint native_fill_window(JNIEnv* env, jobject object, jobject javaWindow,
             LOGE("startPos %d > actual rows %d", startPos, num);
             return num;
         }
-    } 
-    
+    }
+
     while(startPos != 0 || numRows < maxRead) {
         err = sqlite3_step(statement);
         if (err == SQLITE_ROW) {

android-database-sqlcipher/src/main/java/net/sqlcipher/AbstractCursor.java

@@ -77,11 +77,11 @@ public CursorWindow getWindow() {
     public int getColumnCount() {
         return getColumnNames().length;
     }
-    
+
     public void deactivate() {
         deactivateInternal();
     }
-    
+
     /**
      * @hide
      */
@@ -92,10 +92,10 @@ public void deactivateInternal() {
         }
         mDataSetObservable.notifyInvalidated();
     }
-    
+
     public boolean requery() {
         if (mSelfObserver != null && mSelfObserverRegistered == false) {
-        	
+
             mContentResolver.registerContentObserver(mNotifyUri, true, mSelfObserver);
             mSelfObserverRegistered = true;
         }
@@ -106,7 +106,7 @@ public boolean requery() {
     public boolean isClosed() {
         return mClosed;
     }
-    
+
     public void close() {
         mClosed = true;
         mContentObservable.unregisterAll();
@@ -143,7 +143,7 @@ public boolean onMove(int oldPosition, int newPosition) {
         return true;
     }
 
-    
+
     public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
         // Default implementation, uses getString
         String result = getString(columnIndex);
@@ -159,7 +159,7 @@ public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
             buffer.sizeCopied = 0;
         }
     }
-    
+
     /* -------------------------------------------------------- */
     /* Implementation */
     public AbstractCursor() {
@@ -204,7 +204,7 @@ public final boolean moveToPosition(int position) {
 
         return result;
     }
-    
+
     /**
      * Copy data from cursor to CursorWindow
      * @param position start position of data
@@ -388,7 +388,7 @@ public boolean update(int columnIndex, Object obj) {
 
     /**
      * Returns <code>true</code> if there are pending updates that have not yet been committed.
-     * 
+     *
      * @return <code>true</code> if there are pending updates that have not yet been committed.
      * @hide
      * @deprecated
@@ -435,26 +435,26 @@ public void unregisterContentObserver(ContentObserver observer) {
             mContentObservable.unregisterObserver(observer);
         }
     }
-    
+
     /**
      * This is hidden until the data set change model has been re-evaluated.
      * @hide
      */
     protected void notifyDataSetChange() {
         mDataSetObservable.notifyChanged();
     }
-    
+
     /**
      * This is hidden until the data set change model has been re-evaluated.
      * @hide
      */
     protected DataSetObservable getDataSetObservable() {
         return mDataSetObservable;
-        
+
     }
     public void registerDataSetObserver(DataSetObserver observer) {
         mDataSetObservable.registerObserver(observer);
-        
+
     }
 
     public void unregisterDataSetObserver(DataSetObserver observer) {

android-database-sqlcipher/src/main/java/net/sqlcipher/AbstractWindowedCursor.java

@@ -50,18 +50,18 @@ public String getString(int columnIndex)
 
         return mWindow.getString(mPos, columnIndex);
     }
-    
+
     @Override
     public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer)
     {
         checkPosition();
-        
+
         synchronized(mUpdatedRows) {
             if (isFieldUpdated(columnIndex)) {
                 super.copyStringToBuffer(columnIndex, buffer);
             }
         }
-        
+
         mWindow.copyStringToBuffer(mPos, columnIndex, buffer);
     }
 
@@ -220,7 +220,7 @@ public int getType(int columnIndex) {
     protected void checkPosition()
     {
         super.checkPosition();
-        
+
         if (mWindow == null) {
             throw new StaleDataException("Access closed cursor");
         }
@@ -230,7 +230,7 @@ protected void checkPosition()
     public CursorWindow getWindow() {
         return mWindow;
     }
-    
+
     /**
      * Set a new cursor window to cursor, usually set a remote cursor window
      * @param window cursor window
@@ -241,7 +241,7 @@ public void setWindow(CursorWindow window) {
         }
         mWindow = window;
     }
-    
+
     public boolean hasWindow() {
         return mWindow != null;
     }