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 --- .../ccnx/igetandroid/ExampleInstrumentedTest.java | 36 ---- iGetAndroid/app/src/main/AndroidManifest.xml | 27 --- iGetAndroid/app/src/main/cpp/native-lib.cpp | 34 ---- .../com/iget/ccnx/adapter/ListViewAdapter.java | 82 --------- .../iget/ccnx/adapter/OutputListViewElement.java | 94 ---------- .../com/iget/ccnx/igetandroid/iGetActivity.java | 204 --------------------- .../main/java/com/iget/ccnx/utility/Constants.java | 27 --- .../com/iget/ccnx/utility/ResourcesEnumerator.java | 31 ---- .../app/src/main/res/layout/activity_i_get.xml | 113 ------------ .../app/src/main/res/layout/list_view_row.xml | 126 ------------- .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 0 bytes .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4208 -> 0 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2555 -> 0 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6114 -> 0 bytes .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10056 -> 0 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10486 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 14696 -> 0 bytes iGetAndroid/app/src/main/res/values/colors.xml | 6 - iGetAndroid/app/src/main/res/values/strings.xml | 3 - iGetAndroid/app/src/main/res/values/styles.xml | 11 -- .../com/iget/ccnx/igetandroid/ExampleUnitTest.java | 27 --- 24 files changed, 821 deletions(-) delete mode 100644 iGetAndroid/app/src/androidTest/java/com/iget/ccnx/igetandroid/ExampleInstrumentedTest.java delete mode 100644 iGetAndroid/app/src/main/AndroidManifest.xml delete mode 100644 iGetAndroid/app/src/main/cpp/native-lib.cpp delete mode 100644 iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/ListViewAdapter.java delete mode 100644 iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/OutputListViewElement.java delete mode 100644 iGetAndroid/app/src/main/java/com/iget/ccnx/igetandroid/iGetActivity.java delete mode 100644 iGetAndroid/app/src/main/java/com/iget/ccnx/utility/Constants.java delete mode 100644 iGetAndroid/app/src/main/java/com/iget/ccnx/utility/ResourcesEnumerator.java delete mode 100644 iGetAndroid/app/src/main/res/layout/activity_i_get.xml delete mode 100644 iGetAndroid/app/src/main/res/layout/list_view_row.xml delete mode 100644 iGetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 iGetAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 iGetAndroid/app/src/main/res/values/colors.xml delete mode 100644 iGetAndroid/app/src/main/res/values/strings.xml delete mode 100644 iGetAndroid/app/src/main/res/values/styles.xml delete mode 100644 iGetAndroid/app/src/test/java/com/iget/ccnx/igetandroid/ExampleUnitTest.java (limited to 'iGetAndroid/app/src') diff --git a/iGetAndroid/app/src/androidTest/java/com/iget/ccnx/igetandroid/ExampleInstrumentedTest.java b/iGetAndroid/app/src/androidTest/java/com/iget/ccnx/igetandroid/ExampleInstrumentedTest.java deleted file mode 100644 index 9b4f15d4..00000000 --- a/iGetAndroid/app/src/androidTest/java/com/iget/ccnx/igetandroid/ExampleInstrumentedTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2017 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 com.iget.ccnx.igetandroid; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.iget.ccnx.igetandroid", appContext.getPackageName()); - } -} diff --git a/iGetAndroid/app/src/main/AndroidManifest.xml b/iGetAndroid/app/src/main/AndroidManifest.xml deleted file mode 100644 index c7e9d49c..00000000 --- a/iGetAndroid/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/iGetAndroid/app/src/main/cpp/native-lib.cpp b/iGetAndroid/app/src/main/cpp/native-lib.cpp deleted file mode 100644 index d3cabb51..00000000 --- a/iGetAndroid/app/src/main/cpp/native-lib.cpp +++ /dev/null @@ -1,34 +0,0 @@ - -/* - * Copyright (c) 2017 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. - */ -#include -#include - -#include - - - -extern "C" -JNIEXPORT jstring JNICALL -Java_com_iget_ccnx_igetandroid_iGetActivity_downloadFile(JNIEnv *env, jobject instance, - jstring path_) { - const char *path = env->GetStringUTFChars(path_, 0); - std::string name(path); - libl4::http::HTTPClientConnection connection; - connection.get(name); - std::string str(reinterpret_cast(connection.response().data()), - connection.response().size()); - return env->NewStringUTF(str.c_str()); -} \ No newline at end of file diff --git a/iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/ListViewAdapter.java b/iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/ListViewAdapter.java deleted file mode 100644 index 45677a52..00000000 --- a/iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/ListViewAdapter.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2017 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 com.iget.ccnx.adapter; - -import android.content.Context; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.TextView; - -import com.iget.ccnx.igetandroid.R; -import com.iget.ccnx.utility.Constants; - -import java.io.File; -import java.util.ArrayList; - -public class ListViewAdapter extends BaseAdapter { - - Context context; - ArrayList outputListViewElementArrayList; - private static LayoutInflater inflater = null; - - public ListViewAdapter(Context context, ArrayList outputListViewElementArrayList) { - this.context = context; - this.outputListViewElementArrayList = outputListViewElementArrayList; - inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - } - - @Override - public int getCount() { - return outputListViewElementArrayList.size(); - } - - @Override - public Object getItem(int position) { - return outputListViewElementArrayList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View view = convertView; - if (view == null) - view = inflater.inflate(R.layout.list_view_row, null); - TextView urlTextView = (TextView) view.findViewById(R.id.urlTextView); - urlTextView.setText(outputListViewElementArrayList.get(position).getUrl()); - - TextView savedPathTextView = (TextView) view.findViewById(R.id.savedPathTextView); - savedPathTextView.setText(outputListViewElementArrayList.get(position).getSavedPath() + File.separator + outputListViewElementArrayList.get(position).getNameFile()); - - TextView md5TextView = (TextView) view.findViewById(R.id.md5TextView); - md5TextView.setText(outputListViewElementArrayList.get(position).getMd5()); - - TextView sizeTextView = (TextView) view.findViewById(R.id.sizeTextView); - sizeTextView.setText(Integer.toString(outputListViewElementArrayList.get(position).getSize())); - - TextView dateTextView = (TextView) view.findViewById(R.id.dateTextView); - dateTextView.setText(outputListViewElementArrayList.get(position).getDateSting(Constants.FORMAT_DATA)); - - - return view; - } -} diff --git a/iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/OutputListViewElement.java b/iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/OutputListViewElement.java deleted file mode 100644 index 34c7620d..00000000 --- a/iGetAndroid/app/src/main/java/com/iget/ccnx/adapter/OutputListViewElement.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2017 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 com.iget.ccnx.adapter; - -import java.io.Serializable; -import java.text.SimpleDateFormat; -import java.util.Date; - - -public class OutputListViewElement implements Serializable{ - - String url; - String savedPath; - String nameFile; - String md5; - int size; - Date date; - - public OutputListViewElement(String url, String savedPath, String nameFile, String md5, int size) { - this.url = url; - this.savedPath = savedPath; - this.nameFile = nameFile; - this.md5 = md5; - this.size = size; - this.date = new Date(); - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getSavedPath() { - return savedPath; - } - - public void setSavedPath(String savedPath) { - this.savedPath = savedPath; - } - - public String getNameFile() { - return nameFile; - } - - public void setNameFile(String nameFile) { - this.nameFile = nameFile; - } - - public String getMd5() { - return md5; - } - - public void setMd5(String md5) { - this.md5 = md5; - } - - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public String getDateSting(String format) { - return new SimpleDateFormat(format).format(date); - } - - - -} diff --git a/iGetAndroid/app/src/main/java/com/iget/ccnx/igetandroid/iGetActivity.java b/iGetAndroid/app/src/main/java/com/iget/ccnx/igetandroid/iGetActivity.java deleted file mode 100644 index 293561c6..00000000 --- a/iGetAndroid/app/src/main/java/com/iget/ccnx/igetandroid/iGetActivity.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) 2017 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 com.iget.ccnx.igetandroid; - -import android.Manifest; -import android.content.SharedPreferences; -import android.content.pm.PackageManager; -import android.content.res.Configuration; -import android.os.Environment; -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.ArrayAdapter; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.TextView; -import android.widget.Toast; - -import com.iget.ccnx.adapter.ListViewAdapter; -import com.iget.ccnx.adapter.OutputListViewElement; -import com.iget.ccnx.utility.Constants; -import com.iget.ccnx.utility.ResourcesEnumerator; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.PrintStream; -import java.nio.ByteBuffer; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Date; - -public class iGetActivity extends AppCompatActivity { - - static { - System.loadLibrary("native-lib"); - } - - private static String TAG = "iGetAcrivity"; - - public native String downloadFile(String path); - - ArrayList outputListViewElementArrayList = new ArrayList(); - ListViewAdapter adapter; - - - static int fCount = 0; - SharedPreferences sharedPreferences; - EditText urlEditText; - EditText downloadPathEditText; - Button downloadButton; - ListView resultListView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_i_get); - adapter = new ListViewAdapter(this, outputListViewElementArrayList); - resultListView = (ListView) findViewById(R.id.resultsListView); - resultListView.setAdapter(adapter); - checkEnabledPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE); - checkEnabledPermission(Manifest.permission.READ_EXTERNAL_STORAGE); - init(); - } - - public static final String md5(final String s) { - final String MD5 = "MD5"; - try { - // Create MD5 Hash - MessageDigest digest = java.security.MessageDigest - .getInstance(MD5); - digest.update(s.getBytes()); - byte messageDigest[] = digest.digest(); - - // Create Hex String - StringBuilder hexString = new StringBuilder(); - for (byte aMessageDigest : messageDigest) { - String h = Integer.toHexString(0xFF & aMessageDigest); - while (h.length() < 2) - h = "0" + h; - hexString.append(h); - } - return hexString.toString(); - - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - return ""; - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - outState.putSerializable(Constants.LIST_ITEMS_ID, outputListViewElementArrayList); - super.onSaveInstanceState(outState); - } - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - if (savedInstanceState != null) { - outputListViewElementArrayList = (ArrayList) savedInstanceState.getSerializable(Constants.LIST_ITEMS_ID); - adapter = new ListViewAdapter(this, outputListViewElementArrayList); - resultListView = (ListView) findViewById(R.id.resultsListView); - resultListView.setAdapter(adapter); - } - super.onRestoreInstanceState(savedInstanceState); - } - - private void init() { - Log.v("storage path", Environment.getExternalStorageDirectory().toString()); - sharedPreferences = getSharedPreferences(Constants.I_GET_PREFERENCES, MODE_PRIVATE); - urlEditText = (EditText) findViewById(R.id.urlEditText); - urlEditText.setText(sharedPreferences.getString(ResourcesEnumerator.URL.key(), Constants.DEFAULT_URL)); - downloadPathEditText = (EditText) findViewById(R.id.downloadPathEditText); - downloadPathEditText.setText(sharedPreferences.getString(ResourcesEnumerator.DOWNLOAD_PATH.key(), Constants.DEFAULT_DOWNLOAD_PATH)); - downloadButton = (Button) findViewById(R.id.downloadButton); - downloadButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - SharedPreferences.Editor sharedPreferencesEditor = getSharedPreferences(Constants.I_GET_PREFERENCES, MODE_PRIVATE).edit(); - sharedPreferencesEditor.putString(ResourcesEnumerator.URL.key(), urlEditText.getText().toString()); - sharedPreferencesEditor.putString(ResourcesEnumerator.DOWNLOAD_PATH.key(), downloadPathEditText.getText().toString()); - sharedPreferencesEditor.commit(); - String[] urlSplitted = urlEditText.getText().toString().split(File.separator); - File downloadPath = new File(downloadPathEditText.getText().toString()); - if (!downloadPath.exists()) { - downloadPath.mkdirs(); - } - Date startDate = new Date(); - String content = downloadFile(urlEditText.getText().toString()); - Date stopDate = new Date(); - - if (content.length() > 0) { - String nameFile = writeToFile(content, downloadPathEditText.getText().toString(), urlSplitted[urlSplitted.length - 1]); - outputListViewElementArrayList.add(0, new OutputListViewElement(urlEditText.getText().toString(), downloadPathEditText.getText().toString(), nameFile, md5(content), content.length())); - adapter.notifyDataSetChanged(); - } else { - outputListViewElementArrayList.add(0, new OutputListViewElement(urlEditText.getText().toString(), Constants.DASH, Constants.DASH, Constants.DASH, 0)); - } - } - }); - } - - 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 String writeToFile(String content, String path, String nameFile) { - try { - nameFile = checkGenerateNameFile(path, nameFile.trim()); - PrintStream out = new PrintStream(new FileOutputStream(path + File.separator + nameFile)); - out.print(content); - } catch (FileNotFoundException e) { - Log.v(TAG, e.toString()); - } - return nameFile; - } - - private String checkGenerateNameFile(String path, String nameFile) { - String newNameFile = nameFile.trim(); - - File file; - int count = 1; - do { - file = new File(path + File.separator + newNameFile); - - - if (file.exists()) { - - newNameFile = nameFile.trim() + Constants.UNDERSCORE + Integer.toString(count); - count++; - } - } while (file.exists()); - return newNameFile; - } - -} diff --git a/iGetAndroid/app/src/main/java/com/iget/ccnx/utility/Constants.java b/iGetAndroid/app/src/main/java/com/iget/ccnx/utility/Constants.java deleted file mode 100644 index 6c1a7864..00000000 --- a/iGetAndroid/app/src/main/java/com/iget/ccnx/utility/Constants.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017 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 com.iget.ccnx.utility; - -public class Constants { - public static final String LIST_ITEMS_ID = "LIST_ITEMS_ID"; - public static final String I_GET_PREFERENCES = "I_GET_PREFERENCES"; - public static final String DEFAULT_URL = "http://webserver/sintel/mpd"; - public static final String DEFAULT_DOWNLOAD_PATH = "/storage/emulated/0/GetD"; - - public static final String FORMAT_DATA = "yyyy-MM-dd hh:mm:ss"; - public static final String UNDERSCORE = "_"; - public static final String DASH = "-"; -} diff --git a/iGetAndroid/app/src/main/java/com/iget/ccnx/utility/ResourcesEnumerator.java b/iGetAndroid/app/src/main/java/com/iget/ccnx/utility/ResourcesEnumerator.java deleted file mode 100644 index ebe6af69..00000000 --- a/iGetAndroid/app/src/main/java/com/iget/ccnx/utility/ResourcesEnumerator.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2017 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 com.iget.ccnx.utility; - -public enum ResourcesEnumerator { - URL("url"), - DOWNLOAD_PATH("downloadPath"); - - private String key; - - ResourcesEnumerator(String key) { - this.key = key; - } - - public String key() { - return key; - } -} diff --git a/iGetAndroid/app/src/main/res/layout/activity_i_get.xml b/iGetAndroid/app/src/main/res/layout/activity_i_get.xml deleted file mode 100644 index 4885dc62..00000000 --- a/iGetAndroid/app/src/main/res/layout/activity_i_get.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -