fix(memory): change support to camera

Signed-off-by: Ivan Del Pino <idelpino@teclib.com>
glpi-project · Dec 14, 2018 · 68019d6 · 68019d6
1 parent 5485005
commit 68019d6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/example_java/src/main/java/org/flyve/example_java/MainActivity.java b/example_java/src/main/java/org/flyve/example_java/MainActivity.java
@@ -37,7 +37,6 @@ protected void onCreate(Bundle savedInstanceState) {
         ActivityCompat.requestPermissions(MainActivity.this,
                 new String[]{
                         Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.READ_PHONE_STATE,
                         Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.CAMERA,
                 },
@@ -90,8 +89,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
                 if (grantResults.length > 0
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED
                         && grantResults[1] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[2] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[3] == PackageManager.PERMISSION_GRANTED) {
+                        && grantResults[2] == PackageManager.PERMISSION_GRANTED) {
                 }
             }
         }

diff --git a/example_kotlin/src/main/AndroidManifest.xml b/example_kotlin/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".SecondActivity" />
     </application>
 
 </manifest>
diff --git a/example_kotlin/src/main/java/org/flyve/example_kotlin/SecondActivity.kt b/example_kotlin/src/main/java/org/flyve/example_kotlin/SecondActivity.kt
@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.support.v4.app.ActivityCompat
 import android.support.v7.app.AppCompatActivity
 import android.util.Log
-import kotlinx.android.synthetic.main.activity_main.*
 import org.flyve.inventory.InventoryTask
 
 class SecondActivity : AppCompatActivity() {
@@ -43,13 +42,5 @@ class SecondActivity : AppCompatActivity() {
                 Log.e(LOG, error.message)
             }
         })
-        textHello.setOnClickListener {
-            inventoryTask?.isEndIterCategories = true
-        }
-    }
-
-    override fun onBackPressed() {
-        super.onBackPressed()
-        inventoryTask?.isEndIterCategories = true
     }
 }
diff --git a/inventory/src/main/java/org/flyve/inventory/categories/Cameras.java b/inventory/src/main/java/org/flyve/inventory/categories/Cameras.java
@@ -109,10 +109,7 @@ public Cameras(Context xCtx) {
                         c.put("MANUFACTURER", new CategoryValue(getManufacturer(index), "MANUFACTURER", "manufacturer"));
                     }
                     c.put("RESOLUTIONVIDEO", new CategoryValue(getVideoResolution(index), "RESOLUTIONVIDEO", "resolutionvideo"));
-                    ArrayList<String> supportValue = getSupportValue();
-                    if (supportValue.size() > 0) {
-                        c.put("SUPPORTS", new CategoryValue(supportValue, "SUPPORTS", "supports"));
-                    }
+                    c.put("SUPPORTS", new CategoryValue("N/A", "SUPPORTS", "supports"));
                     c.put("MODEL", new CategoryValue(getModel(index), "MODEL", "model"));
                     this.add(c);
                 }