gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored android example_app

Browse Source
This commit is contained in:
Joseph Henry
2016-06-24 11:07:57 -07:00
parent eb29aaa3f2
commit b545aed175
13 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/android/example_app/app/build.gradle
View File

@@ -4,7 +4,7 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
defaultConfig {
applicationId "com.example.joseph.example_android_app"
applicationId "com.example.joseph.example_app"
minSdkVersion 15
targetSdkVersion 23
versionCode 1

4
integrations/android/example_app/app/src/androidTest/java/com/example/joseph/example_android_app/ExampleInstrumentationTest.java → integrations/android/example_app/app/src/androidTest/java/com/example/joseph/example_app/ExampleInstrumentationTest.java
View File

@@ -1,4 +1,4 @@
package com.example.joseph.example_android_app;
package com.example.joseph.example_app;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
@@ -24,6 +24,6 @@ public class ExampleInstrumentationTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("com.example.joseph.example_android_app", appContext.getPackageName());
assertEquals("com.example.joseph.example_app", appContext.getPackageName());
}
}

6
integrations/android/example_app/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.joseph.example_android_app">
package="com.example.joseph.example_app">
<application
android:allowBackup="true"
@@ -8,10 +8,6 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

4
integrations/android/example_app/app/src/main/java/ZeroTierSDK/ZeroTierSDK/ZeroTierSDK.java → integrations/android/example_app/app/src/main/java/SDK/SDK.java
View File

@@ -1,5 +1,5 @@
package ZeroTierSDK.ZeroTierSDK;
public class ZeroTierSDK {
package SDK;
public class SDK {
public native void startOneService();
static { System.loadLibrary("ZeroTierOneJNI"); } // Loads JNI code
}

9
integrations/android/example_app/app/src/main/java/com/example/joseph/example_android_app/MainActivity.java → integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
View File

@@ -1,8 +1,10 @@
package com.example.joseph.example_android_app;
package com.example.joseph.example_app;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import SDK.SDK;
public class MainActivity extends AppCompatActivity {
@Override
@@ -12,10 +14,9 @@ public class MainActivity extends AppCompatActivity {
new Thread(new Runnable() {
public void run() {
ZeroTierSDK wrapper = new ZeroTierSDK();
SDK wrapper = new SDK();
wrapper.startOneService(); // Calls to JNI code
}
}).start();
}
}
}

2
integrations/android/example_app/app/src/main/res/layout/activity_main.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.joseph.example_android_app.MainActivity">
tools:context="com.example.joseph.example_app.MainActivity">
<TextView
android:layout_width="wrap_content"

2
integrations/android/example_app/app/src/main/res/values/strings.xml
View File

@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Example_Android_App</string>
<string name="app_name">example_app</string>
</resources>

2
integrations/android/example_app/app/src/test/java/com/example/joseph/example_android_app/ExampleUnitTest.java → integrations/android/example_app/app/src/test/java/com/example/joseph/example_app/ExampleUnitTest.java
View File

@@ -1,4 +1,4 @@
package com.example.joseph.example_android_app;
package com.example.joseph.example_app;
import org.junit.Test;

3
integrations/android/example_app/gradle.properties
View File

@@ -11,9 +11,6 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
org.gradle.daemon=true
org.gradle.parallel=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects