godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Style: Format code with clang-format 6.0.1

Browse Source
This commit is contained in:
Rémi Verschelde
2018-07-18 17:56:12 +02:00
parent 792a0cdb53
commit bb13fa896e
36 changed files with 57 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/android/java/src/org/godotengine/godot/Dictionary.java
View File

@@ -78,4 +78,3 @@ public class Dictionary extends HashMap<String, Object> {
keys_cache = null;
};
};

12
platform/android/java/src/org/godotengine/godot/Godot.java
View File

@@ -410,7 +410,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
_self = this;
Window window = getWindow();
window.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
mClipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
mClipboard = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
if (true) {
boolean md5mismatch = false;
@@ -583,8 +583,8 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
String copiedText = "";
if (mClipboard.getPrimaryClip() != null) {
ClipData.Item item = mClipboard.getPrimaryClip().getItemAt(0);
copiedText = item.getText().toString();
ClipData.Item item = mClipboard.getPrimaryClip().getItemAt(0);
copiedText = item.getText().toString();
}
return copiedText;
@@ -646,10 +646,10 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
float[] adjustedValues = new float[3];
final int axisSwap[][] = {
{ 1, -1, 0, 1 }, // ROTATION_0
{ 1, -1, 0, 1 }, // ROTATION_0
{ -1, -1, 1, 0 }, // ROTATION_90
{ -1, 1, 0, 1 }, // ROTATION_180
{ 1, 1, 1, 0 } // ROTATION_270
{ -1, 1, 0, 1 }, // ROTATION_180
{ 1, 1, 1, 0 } // ROTATION_270
};
final int[] as = axisSwap[displayRotation];

2
platform/android/java/src/org/godotengine/godot/GodotIO.java
View File

@@ -436,7 +436,6 @@ public class GodotIO {
Log.v(TAG, "Problem stopping audio thread: " + e);
}
mAudioThread = null;
}
if (mAudioTrack != null) {
@@ -515,7 +514,6 @@ public class GodotIO {
public void showKeyboard(String p_existing_text) {
if (edit != null)
edit.showKeyboard(p_existing_text);
};
public void hideKeyboard() {

2
platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java
View File

@@ -61,7 +61,6 @@ abstract public class ConsumeTask {
}
final String token = _token;
new AsyncTask<String, String, String>() {
@Override
protected String doInBackground(String... params) {
try {
@@ -83,7 +82,6 @@ abstract public class ConsumeTask {
error(param);
}
}
}
.execute();
}

8
platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java
View File

@@ -308,14 +308,12 @@ public class PaymentsManager {
public void processPurchaseResponse(int resultCode, Intent data) {
HandlePurchaseTask handlePurchaseTask = new HandlePurchaseTask(activity) {
@Override
protected void success(final String sku, final String signature, final String ticket) {
godotPaymentV3.callbackSuccess(ticket, signature, sku);
if (auto_consume) {
new ConsumeTask(mService, activity) {
@Override
protected void success(String ticket) {
}
@@ -346,12 +344,10 @@ public class PaymentsManager {
public void validatePurchase(String purchaseToken, final String sku) {
new ValidateTask(activity, godotPaymentV3) {
@Override
protected void success() {
new ConsumeTask(mService, activity) {
@Override
protected void success(String ticket) {
godotPaymentV3.callbackSuccess(ticket, null, sku);
@@ -384,7 +380,6 @@ public class PaymentsManager {
public void consume(final String sku) {
new ConsumeTask(mService, activity) {
@Override
protected void success(String ticket) {
godotPaymentV3.callbackSuccessProductMassConsumed(ticket, "", sku);
@@ -527,7 +522,8 @@ public class PaymentsManager {
}
godotPaymentV3.completeSkuDetail();
}
})).start();
}))
.start();
}
public void setBaseSingleton(GodotPaymentV3 godotPaymentV3) {

1
platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java
View File

@@ -84,7 +84,6 @@ abstract public class ReleaseAllConsumablesTask {
String token = inappPurchaseData.getString("purchaseToken");
String signature = mySignatures.get(i);
new GenericConsumeTask(context, mService, sku, receipt, signature, token) {
@Override
public void onSuccess(String sku, String receipt, String signature, String token) {
ReleaseAllConsumablesTask.this.success(sku, receipt, signature, token);

2
platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java
View File

@@ -62,7 +62,6 @@ abstract public class ValidateTask {
public void validatePurchase(final String sku) {
new AsyncTask<String, String, String>() {
private ProgressDialog dialog;
@Override
@@ -107,7 +106,6 @@ abstract public class ValidateTask {
error(e.getMessage());
}
}
}
.execute();
}