From 5d308865d0783d0cd70f7453c77980835ac5648e Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Wed, 21 Mar 2018 14:16:02 +0100 Subject: update android-sdk. Now it is possible to compile with clang Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2 Signed-off-by: Angelo Mantellini --- .../com/httpserver/HttpServerActivity.java | 187 +++++++++++++++++++++ .../httpserver/com/service/HttpServerService.java | 156 +++++++++++++++++ .../httpserver/com/supportlibrary/HttpServer.java | 46 +++++ .../java/icn/httpserver/com/utility/Constants.java | 28 +++ .../com/utility/ResourcesEnumerator.java | 34 ++++ 5 files changed, 451 insertions(+) create mode 100644 HttpServer/app/src/main/java/icn/httpserver/com/httpserver/HttpServerActivity.java create mode 100644 HttpServer/app/src/main/java/icn/httpserver/com/service/HttpServerService.java create mode 100644 HttpServer/app/src/main/java/icn/httpserver/com/supportlibrary/HttpServer.java create mode 100644 HttpServer/app/src/main/java/icn/httpserver/com/utility/Constants.java create mode 100644 HttpServer/app/src/main/java/icn/httpserver/com/utility/ResourcesEnumerator.java (limited to 'HttpServer/app/src/main/java') diff --git a/HttpServer/app/src/main/java/icn/httpserver/com/httpserver/HttpServerActivity.java b/HttpServer/app/src/main/java/icn/httpserver/com/httpserver/HttpServerActivity.java new file mode 100644 index 00000000..78ef8ff2 --- /dev/null +++ b/HttpServer/app/src/main/java/icn/httpserver/com/httpserver/HttpServerActivity.java @@ -0,0 +1,187 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * 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 + * + * 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. + */ + +package icn.httpserver.com.httpserver; + +import android.Manifest; +import android.app.Dialog; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.net.Uri; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.CompoundButton; +import android.widget.EditText; +import android.widget.Switch; + +import icn.httpserver.com.service.HttpServerService; +import icn.httpserver.com.supportlibrary.HttpServer; +import icn.httpserver.com.utility.Constants; +import icn.httpserver.com.utility.ResourcesEnumerator; + +public class HttpServerActivity extends AppCompatActivity { + private EditText rootFolderEditText; + private EditText tcpListenPortEditText; + private EditText webServerPrefixEditText; + private EditText proxyAddressEditText; + private EditText iCNproxyAddressEditText; + private Switch httpServerSwitch; + private Button yesButtonDialog; + private Button noButtonDialog; + + + private SharedPreferences sharedPreferences; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_http_server); + checkEnabledPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE); + checkEnabledPermission(Manifest.permission.READ_EXTERNAL_STORAGE); + if (!checkMetis(Constants.METIS_ID)) { + final Dialog dialog = new Dialog(this); + dialog.setContentView(R.layout.popup_message); + yesButtonDialog = (Button) dialog.findViewById(R.id.yesButtonDialog); + noButtonDialog = (Button) dialog.findViewById(R.id.noButtonDialog); + yesButtonDialog.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + try { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.METIS_ID))); + } catch (android.content.ActivityNotFoundException anfe) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + Constants.METIS_ID))); + } + dialog.hide(); + } + }); + noButtonDialog.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dialog.hide(); + } + }); + dialog.show(); + + } + init(); + } + + + private void checkEnabledPermission(String permission) { + if (ContextCompat.checkSelfPermission(this, + permission) + != PackageManager.PERMISSION_GRANTED) { + if (ActivityCompat.shouldShowRequestPermissionRationale(this, + permission)) { + } else { + ActivityCompat.requestPermissions(this, + new String[]{permission}, + 1); + } + } + } + + private boolean checkMetis(String uri) { + PackageManager pm = getPackageManager(); + try { + pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); + return true; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } + + private void init() { + sharedPreferences = getSharedPreferences(Constants.HTTP_SERVER_PREFERENCES, MODE_PRIVATE); + rootFolderEditText = (EditText) findViewById(R.id.rootFolderEditText); + rootFolderEditText.setText(sharedPreferences.getString(ResourcesEnumerator.ROOT_FOLDER.key(), Constants.DEFAULT_ROOT_FOLDER)); + tcpListenPortEditText = (EditText) findViewById(R.id.tcpListenPortEditText); + tcpListenPortEditText.setText(sharedPreferences.getString(ResourcesEnumerator.TCP_LISTEN_PORT.key(), Constants.DEFAULT_TCP_LISTEN_PORT)); + webServerPrefixEditText = (EditText) findViewById(R.id.webServerPrefixEditText); + webServerPrefixEditText.setText(sharedPreferences.getString(ResourcesEnumerator.WEBSERVER_PREFIX.key(), Constants.DEFAULT_WEBSERVER_PREFIX)); + proxyAddressEditText = (EditText) findViewById(R.id.proxyAddressEditText); + proxyAddressEditText.setText(sharedPreferences.getString(ResourcesEnumerator.PROXY_ADDRESS.key(), Constants.DEFAULT_PROXY_ADDRESS)); + iCNproxyAddressEditText = (EditText) findViewById(R.id.iCNproxyAddressEditText); + iCNproxyAddressEditText.setText(sharedPreferences.getString(ResourcesEnumerator.ICN_PROXY_ADDRESS.key(), Constants.DEFAULT_ICN_PROXY_ADDRESS)); + httpServerSwitch = (Switch) findViewById(R.id.httpServerSwitch); + if (HttpServer.getInstance().isRunning()) { + httpServerSwitch.setChecked(true); + rootFolderEditText.setEnabled(false); + tcpListenPortEditText.setEnabled(false); + webServerPrefixEditText.setEnabled(false); + proxyAddressEditText.setEnabled(false); + iCNproxyAddressEditText.setEnabled(false); + } + + httpServerSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + Log.v("Switch State=", "" + isChecked); + if (isChecked) { + httpServerSwitch.setText(Constants.ENABLED); + SharedPreferences.Editor sharedPreferencesEditor = getSharedPreferences(Constants.HTTP_SERVER_PREFERENCES, MODE_PRIVATE).edit(); + sharedPreferencesEditor.putString(ResourcesEnumerator.ROOT_FOLDER.key(), rootFolderEditText.getText().toString()); + sharedPreferencesEditor.putString(ResourcesEnumerator.TCP_LISTEN_PORT.key(), tcpListenPortEditText.getText().toString()); + sharedPreferencesEditor.putString(ResourcesEnumerator.WEBSERVER_PREFIX.key(), webServerPrefixEditText.getText().toString()); + sharedPreferencesEditor.putString(ResourcesEnumerator.PROXY_ADDRESS.key(), proxyAddressEditText.getText().toString()); + sharedPreferencesEditor.putString(ResourcesEnumerator.ICN_PROXY_ADDRESS.key(), iCNproxyAddressEditText.getText().toString()); + sharedPreferencesEditor.commit(); + rootFolderEditText.setEnabled(false); + tcpListenPortEditText.setEnabled(false); + webServerPrefixEditText.setEnabled(false); + proxyAddressEditText.setEnabled(false); + iCNproxyAddressEditText.setEnabled(false); + startHttpServer(); + + } else { + httpServerSwitch.setText(Constants.DISABLED); + rootFolderEditText.setEnabled(true); + tcpListenPortEditText.setEnabled(true); + webServerPrefixEditText.setEnabled(true); + proxyAddressEditText.setEnabled(true); + iCNproxyAddressEditText.setEnabled(true); + stopHttpServer(); + } + } + + }); + + + } + + private void startHttpServer() { + Intent intent = new Intent(this, HttpServerService.class); + startService(intent); + } + + private void stopHttpServer() { + Intent intent = new Intent(this, HttpServerService.class); + stopService(intent); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + } + +} diff --git a/HttpServer/app/src/main/java/icn/httpserver/com/service/HttpServerService.java b/HttpServer/app/src/main/java/icn/httpserver/com/service/HttpServerService.java new file mode 100644 index 00000000..977993ee --- /dev/null +++ b/HttpServer/app/src/main/java/icn/httpserver/com/service/HttpServerService.java @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * 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 + * + * 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. + */ + +package icn.httpserver.com.service; + +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.app.Service; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Build; +import android.os.IBinder; +import android.util.Log; + +import java.io.File; + +import icn.httpserver.com.httpserver.HttpServerActivity; +import icn.httpserver.com.supportlibrary.HttpServer; +import icn.httpserver.com.utility.Constants; +import icn.httpserver.com.utility.ResourcesEnumerator; + +/** + * Created by angelomantellini on 12/11/17. + */ + + +public class HttpServerService extends Service { + private final static String TAG = "HttpServerService"; + + private static Thread sHttpServerThread = null; + + public HttpServerService() { + } + + private String rootFolderString; + private String tcpListenPortString; + private String webServerPrefixString; + private String proxyAddressString; + private String iCNproxyAddressString; + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + + HttpServer httpServer = HttpServer.getInstance(); + if (!httpServer.isRunning()) { + Log.d(TAG, "Starting Http Server"); + SharedPreferences sharedPreferences = getSharedPreferences(Constants.HTTP_SERVER_PREFERENCES, MODE_PRIVATE); + String rootFolderString = sharedPreferences.getString(ResourcesEnumerator.ROOT_FOLDER.key(), + null); + String tcpListenPortString = sharedPreferences.getString(ResourcesEnumerator.TCP_LISTEN_PORT.key(), null); + String webServerPrefixString = sharedPreferences.getString(ResourcesEnumerator.WEBSERVER_PREFIX.key(), null); + String proxyAddressString = sharedPreferences.getString(ResourcesEnumerator.PROXY_ADDRESS.key(), null); + String iCNproxyAddressString = sharedPreferences.getString(ResourcesEnumerator.ICN_PROXY_ADDRESS.key(), null); + File folder = new File(rootFolderString); + if (!folder.exists()) { + folder.mkdirs(); + } + + + startHttpServer(intent, rootFolderString, tcpListenPortString, webServerPrefixString, proxyAddressString, iCNproxyAddressString); + + + } else { + Log.d(TAG, "Http Server is already running."); + } + return Service.START_STICKY; + } + + + @Override + public void onDestroy() { + HttpServer httpServer = HttpServer.getInstance(); + Log.d(TAG, "Destroying HttpServer"); + if (httpServer.isRunning()) { + httpServer.stop(); + stopForeground(true); + } + super.onDestroy(); + } + + protected Runnable mHttpServerRunner = new Runnable() { + + //private String path; + @Override + public void run() { + HttpServer httpServer = HttpServer.getInstance(); + httpServer.start(rootFolderString, tcpListenPortString, webServerPrefixString, proxyAddressString, iCNproxyAddressString); + } + + + }; + + private void startHttpServer(Intent intent, String rootFolderString, String tcpListenPortString, String webServerPrefixString, String proxyAddressString, String iCNproxyAddressString) { + String NOTIFICATION_CHANNEL_ID = "12345"; + Notification.Builder notificationBuilder = null; + if (Build.VERSION.SDK_INT >= 26) { + notificationBuilder = new Notification.Builder(this, NOTIFICATION_CHANNEL_ID); + } else { + notificationBuilder = new Notification.Builder(this); + } + Intent notificationIntent = new Intent(this, HttpServerActivity.class); + PendingIntent activity = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT); + + notificationBuilder.setContentTitle("HttpServer").setContentText("HttpServer").setOngoing(true).setContentIntent(activity); + Notification notification = notificationBuilder.build(); + + if (Build.VERSION.SDK_INT >= 26) { + NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "HttpServer", NotificationManager.IMPORTANCE_DEFAULT); + channel.setDescription("HttpServer"); + NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + notificationManager.createNotificationChannel(channel); + + } + + startForeground(Constants.FOREGROUND_SERVICE, notification); + + + HttpServer httpServer = HttpServer.getInstance(); + if (!httpServer.isRunning()) { + this.rootFolderString = rootFolderString; + this.tcpListenPortString = tcpListenPortString; + this.webServerPrefixString = webServerPrefixString; + this.proxyAddressString = proxyAddressString; + this.iCNproxyAddressString = iCNproxyAddressString; + sHttpServerThread = new Thread(mHttpServerRunner, "HttpServerRunner"); + sHttpServerThread.start(); + } + + + Log.e(TAG, "HttpServer Started"); + + } + + +} diff --git a/HttpServer/app/src/main/java/icn/httpserver/com/supportlibrary/HttpServer.java b/HttpServer/app/src/main/java/icn/httpserver/com/supportlibrary/HttpServer.java new file mode 100644 index 00000000..5b5356db --- /dev/null +++ b/HttpServer/app/src/main/java/icn/httpserver/com/supportlibrary/HttpServer.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * 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 + * + * 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. + */ +package icn.httpserver.com.supportlibrary; + +public class HttpServer { + + private static HttpServer sInstance = null; + + static { + System.loadLibrary("httpServerWrap"); + + } + + public static HttpServer getInstance() { + if (sInstance == null) { + sInstance = new HttpServer(); + } + return sInstance; + } + + private HttpServer() { + + } + + + public native boolean isRunning(); + + public native void start(String rootFolderString, + String tcpListenPortString, + String webServerPrefixString, + String proxyAddressString, + String iCNproxyAddressString); + public native void stop(); +} diff --git a/HttpServer/app/src/main/java/icn/httpserver/com/utility/Constants.java b/HttpServer/app/src/main/java/icn/httpserver/com/utility/Constants.java new file mode 100644 index 00000000..d44bcbfd --- /dev/null +++ b/HttpServer/app/src/main/java/icn/httpserver/com/utility/Constants.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * 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 + * + * 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. + */ +package icn.httpserver.com.utility; + +public class Constants { + public static final String DEFAULT_ROOT_FOLDER = "/sdcard/HttpServer"; + public static final String DEFAULT_TCP_LISTEN_PORT = "8080"; + public static final String DEFAULT_WEBSERVER_PREFIX = "http://android-webserver"; + public static final String DEFAULT_PROXY_ADDRESS = "http://localhost/proxy"; + public static final String DEFAULT_ICN_PROXY_ADDRESS = "http://systemx-cicn.enst.fr"; + public static final String METIS_ID = "icn.forwarder.com.icnforwarderandroid"; + public static final String ENABLED = "Enabled"; + public static final String DISABLED = "Disabled"; + public static final String HTTP_SERVER_PREFERENCES = "httpServerPreferences"; + public static final int FOREGROUND_SERVICE = 101; +} diff --git a/HttpServer/app/src/main/java/icn/httpserver/com/utility/ResourcesEnumerator.java b/HttpServer/app/src/main/java/icn/httpserver/com/utility/ResourcesEnumerator.java new file mode 100644 index 00000000..8efb10d3 --- /dev/null +++ b/HttpServer/app/src/main/java/icn/httpserver/com/utility/ResourcesEnumerator.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * 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 + * + * 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. + */ + +package icn.httpserver.com.utility; + +public enum ResourcesEnumerator { + ROOT_FOLDER("rootFolder"), + TCP_LISTEN_PORT("tcpListenPort"), + WEBSERVER_PREFIX("webServerPRefix"), + PROXY_ADDRESS("proxyAddress"), + ICN_PROXY_ADDRESS("iCNproxyAddress"); + + private String key; + + ResourcesEnumerator(String key) { + this.key = key; + } + + public String key() { + return key; + } +} -- cgit 1.2.3-korg