refactored android example_app

integrations/android/example_app/app/src/androidTest/java/com/example/joseph/example_app/ExampleInstrumentationTest.java

@@ -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());
     }
 }

integrations/android/example_app/app/src/main/AndroidManifest.xml

@@ -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" />

integrations/android/example_app/app/src/main/java/SDK/SDK.java

@@ -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
 }

integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java

@@ -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();
-
     }
-}
+}

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

@@ -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"

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

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

integrations/android/example_app/app/src/test/java/com/example/joseph/example_app/ExampleUnitTest.java

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